Commit 43c27296 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove write_rfreg from struct hal_ops 



Remove write_rfreg from struct hal_ops and its wrapper
rtw_hal_write_rfreg(). Call rtl8188e_PHY_SetRFReg() directly instead.

Acked-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210910205033.3778-7-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1fe287d

drivers/staging/r8188eu/core/rtw_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask) 


void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val)

{

	rtw_hal_write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask, val);

	rtl8188e_PHY_SetRFReg(padapter, (enum rf_radio_path)rfpath, addr, bitmask, val);

}



u32 read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr)

drivers/staging/r8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -124,11 +124,3 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) 
		UpdateHalRAMask8188EUsb(adapt, mac_id, rssi_level);

	}

}
 


void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath,

			 u32 regaddr, u32 bitmask, u32 data)

{

	if (adapt->HalFunc.write_rfreg)

		adapt->HalFunc.write_rfreg(adapt, rfpath, regaddr,

					      bitmask, data);

}

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+0 −1
Original line number Diff line number Diff line
@@ -1750,7 +1750,6 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable) 
}

void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)

{

	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;

}



u8 GetEEPROMSize8188E(struct adapter *padapter)

drivers/staging/r8188eu/include/hal_intf.h

+0 −8
Original line number Diff line number Diff line
@@ -146,10 +146,6 @@ struct hal_ops { 
	u8	(*SetHalDefVarHandler)(struct adapter *padapter,

				       enum hal_def_variable eVariable,

				       void *pValue);



	void	(*write_rfreg)(struct adapter *padapter,

			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);

};



#define RF_CHANGE_BY_INIT	0
@@ -214,10 +210,6 @@ void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level); 
void	rtw_hal_clone_data(struct adapter *dst_adapt,

			   struct adapter *src_adapt);



void	rtw_hal_write_rfreg(struct adapter *padapter,

			    enum rf_radio_path eRFPath, u32 RegAddr,

			    u32 BitMask, u32 Data);



void indicate_wx_scan_complete_event(struct adapter *padapter);

u8 rtw_do_join(struct adapter *padapter);

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+3 −3
Original line number Diff line number Diff line
@@ -2143,7 +2143,7 @@ static int rtw_wx_write_rf(struct net_device *dev, 
	path = *(u32 *)extra;

	addr = *((u32 *)extra + 1);

	data32 = *((u32 *)extra + 2);

	rtw_hal_write_rfreg(padapter, path, addr, 0xFFFFF, data32);

	rtl8188e_PHY_SetRFReg(padapter, path, addr, 0xFFFFF, data32);



	return 0;

}
@@ -2275,7 +2275,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le 
		offset = (u8)prfreg->offset;

		value = prfreg->value;



		rtw_hal_write_rfreg(padapter, path, offset, 0xffffffff, value);

		rtl8188e_PHY_SetRFReg(padapter, path, offset, 0xffffffff, value);



		break;

	case GEN_MP_IOCTL_SUBCODE(TRIGGER_GPIO):
@@ -3968,7 +3968,7 @@ static int rtw_dbg_port(struct net_device *dev, 
		DBG_88E("read RF_reg path(0x%02x), offset(0x%x), value(0x%08x)\n", minor_cmd, arg, rtl8188e_PHY_QueryRFReg(padapter, minor_cmd, arg, 0xffffffff));

		break;

	case 0x75:/* write_rf */

		rtw_hal_write_rfreg(padapter, minor_cmd, arg, 0xffffffff, extra_arg);

		rtl8188e_PHY_SetRFReg(padapter, minor_cmd, arg, 0xffffffff, extra_arg);

		DBG_88E("write RF_reg path(0x%02x), offset(0x%x), value(0x%08x)\n", minor_cmd, arg, rtl8188e_PHY_QueryRFReg(padapter, minor_cmd, arg, 0xffffffff));

		break;