Skip to contentSkip to conversation

staging: r8188eu: rename _ReadAdapterInfo8188EU to rtw_hal_read_chip_info

PATCH New Ivan Safonov 1 participant 1 message Sep 3, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 32/63 staging: r8188eu: rename _ReadAdapterInfo8188EU to rtw_hal_read_chip_info

And remove two one-line wrappers.

---
 drivers/staging/rtl8188eu/hal/hal_intf.c     | 6 ------
 drivers/staging/rtl8188eu/hal/usb_halinit.c  | 3 +--
 drivers/staging/rtl8188eu/include/hal_intf.h | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -6
index 373d788..fc34f6e 100644
@@ -25,12 +25,6 @@ void rtw_hal_chip_configure(struct adapter *adapt)
 		adapt->HalFunc.intf_chip_configure(adapt);
 }
 
-void rtw_hal_read_chip_info(struct adapter *adapt)
-{
-	if (adapt->HalFunc.read_adapter_info)
-		adapt->HalFunc.read_adapter_info(adapt);
-}
-
 void rtw_hal_read_chip_version(struct adapter *adapt)
 {
 	if (adapt->HalFunc.read_chip_version)
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -2
index 4065416..8968df7 100644
@@ -1137,7 +1137,7 @@ static void _ReadRFType(struct adapter *Adapter)
 	haldata->rf_chip = RF_6052;
 }
 
-static void _ReadAdapterInfo8188EU(struct adapter *Adapter)
+void rtw_hal_read_chip_info(struct adapter *Adapter)
 {
 	unsigned long start = jiffies;
 
@@ -2077,7 +2077,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 
 	halfunc->init_default_value = &rtl8188eu_init_default_value;
 	halfunc->intf_chip_configure = &rtl8188eu_interface_configure;
-	halfunc->read_adapter_info = &_ReadAdapterInfo8188EU;
 
 	rtl8188e_set_hal_ops(halfunc);
 }
drivers/staging/rtl8188eu/include/hal_intf.h +0 -2
index 5ab50ab..a95f3e7 100644
@@ -164,8 +164,6 @@ struct hal_ops {
 
 	void	(*intf_chip_configure)(struct adapter *padapter);
 
-	void	(*read_adapter_info)(struct adapter *padapter);
-
 	s32	(*interrupt_handler)(struct adapter *padapter);
 
 	void	(*set_bwmode_handler)(struct adapter *padapter,
Signature · 1 line
2.7.3