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

staging: r8188eu: remove read_rfreg from struct hal_ops 



Remove read_rfreg from struct hal_ops and its wrapper
rtw_hal_read_rfreg(). Call rtl8188e_PHY_QueryRFReg() 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-6-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_debug.c

+4 −4
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ int proc_get_rf_reg_dump1(char *page, char **start, 
	path = 1;

	len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);

	for (i = 0; i < 0xC0; i++) {

		value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);

		value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);

		if (j % 4 == 1)

			len += snprintf(page + len, count - len, "0x%02x ", i);

		len += snprintf(page + len, count - len, " 0x%08x ", value);
@@ -453,7 +453,7 @@ int proc_get_rf_reg_dump2(char *page, char **start, 
	path = 1;

	len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);

	for (i = 0xC0; i < 0x100; i++) {

		value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);

		value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);

		if (j % 4 == 1)

			len += snprintf(page + len, count - len, "0x%02x ", i);

		len += snprintf(page + len, count - len, " 0x%08x ", value);
@@ -478,7 +478,7 @@ int proc_get_rf_reg_dump3(char *page, char **start, 
	path = 2;

	len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);

	for (i = 0; i < 0xC0; i++) {

		value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);

		value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);

		if (j % 4 == 1)

			len += snprintf(page + len, count - len, "0x%02x ", i);

		len += snprintf(page + len, count - len, " 0x%08x ", value);
@@ -504,7 +504,7 @@ int proc_get_rf_reg_dump4(char *page, char **start, 
	path = 2;

	len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path);

	for (i = 0xC0; i < 0x100; i++) {

		value = rtw_hal_read_rfreg(padapter, path, i, 0xffffffff);

		value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff);

		if (j % 4 == 1)

			len += snprintf(page + len, count - len, "0x%02x ", i);

		len += snprintf(page + len, count - len, " 0x%08x ", value);

drivers/staging/r8188eu/core/rtw_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val) 


u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask)

{

	return rtw_hal_read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask);

	return rtl8188e_PHY_QueryRFReg(padapter, (enum rf_radio_path)rfpath, addr, bitmask);

}



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

drivers/staging/r8188eu/hal/hal_intf.c

+0 −11
Original line number Diff line number Diff line
@@ -125,17 +125,6 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) 
	}

}



u32 rtw_hal_read_rfreg(struct adapter *adapt, enum rf_radio_path rfpath,

		       u32 regaddr, u32 bitmask)

{

	u32 data = 0;



	if (adapt->HalFunc.read_rfreg)

		data = adapt->HalFunc.read_rfreg(adapt, rfpath, regaddr,

						    bitmask);

	return data;

}



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

			 u32 regaddr, u32 bitmask, u32 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->read_rfreg = &rtl8188e_PHY_QueryRFReg;

	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;

}

drivers/staging/r8188eu/include/hal_intf.h

+0 −5
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ struct hal_ops { 
				       enum hal_def_variable eVariable,

				       void *pValue);



	u32	(*read_rfreg)(struct adapter *padapter,

			      enum rf_radio_path eRFPath, u32 RegAddr,

			      u32 BitMask);

	void	(*write_rfreg)(struct adapter *padapter,

			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);
@@ -217,8 +214,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);



u32	rtw_hal_read_rfreg(struct adapter *padapter, enum rf_radio_path eRFPath,

			   u32 RegAddr, u32 BitMask);

void	rtw_hal_write_rfreg(struct adapter *padapter,

			    enum rf_radio_path eRFPath, u32 RegAddr,

			    u32 BitMask, u32 Data);