From 82ccb5972409fe838dd695ce45b79dc597428a4a Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 16 May 2014 10:04:07 +0200 Subject: [PATCH] staging: rtl8723au: Disentangle chip_configure from HAL wrappers Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/hal/hal_intf.c | 6 ------ drivers/staging/rtl8723au/hal/usb_halinit.c | 3 +-- drivers/staging/rtl8723au/include/hal_intf.h | 4 ---- drivers/staging/rtl8723au/include/usb_ops.h | 1 + drivers/staging/rtl8723au/os_dep/usb_intf.c | 2 +- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c index ad8c430657d1..76c8b1fec777 100644 --- a/drivers/staging/rtl8723au/hal/hal_intf.c +++ b/drivers/staging/rtl8723au/hal/hal_intf.c @@ -22,12 +22,6 @@ #include #include -void rtw_hal_chip_configure23a(struct rtw_adapter *padapter) -{ - if (padapter->HalFunc.intf_chip_configure) - padapter->HalFunc.intf_chip_configure(padapter); -} - void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter) { if (padapter->HalFunc.InitSwLeds) diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c index f202ff39537a..96ee3107cb58 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -82,7 +82,7 @@ static bool rtl8723au_set_queue_pipe_mapping(struct rtw_adapter *pAdapter, return result; } -static void rtl8723au_interface_configure(struct rtw_adapter *padapter) +void rtl8723au_chip_configure(struct rtw_adapter *padapter) { struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); @@ -1745,7 +1745,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter) pHalFunc->InitSwLeds = NULL; pHalFunc->DeInitSwLeds = NULL; - pHalFunc->intf_chip_configure = &rtl8723au_interface_configure; pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb; pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb; pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb; diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index 5009c7d73b65..464c29aa8843 100644 --- a/drivers/staging/rtl8723au/include/hal_intf.h +++ b/drivers/staging/rtl8723au/include/hal_intf.h @@ -73,8 +73,6 @@ struct hal_ops { void (*InitSwLeds)(struct rtw_adapter *padapter); void (*DeInitSwLeds)(struct rtw_adapter *padapter); - void (*intf_chip_configure)(struct rtw_adapter *padapter); - void (*enable_interrupt)(struct rtw_adapter *padapter); void (*disable_interrupt)(struct rtw_adapter *padapter); s32 (*interrupt_handler)(struct rtw_adapter *padapter); @@ -179,8 +177,6 @@ uint rtw_hal_init23a(struct rtw_adapter *padapter); uint rtw_hal_deinit23a(struct rtw_adapter *padapter); void rtw_hal_stop(struct rtw_adapter *padapter); -void rtw_hal_chip_configure23a(struct rtw_adapter *padapter); - u8 rtw_hal_set_def_var23a(struct rtw_adapter *padapter, enum hal_def_variable eVariable, void *pValue); diff --git a/drivers/staging/rtl8723au/include/usb_ops.h b/drivers/staging/rtl8723au/include/usb_ops.h index 3afdbda179c0..2836631dee83 100644 --- a/drivers/staging/rtl8723au/include/usb_ops.h +++ b/drivers/staging/rtl8723au/include/usb_ops.h @@ -94,5 +94,6 @@ static inline u8 rtw_usb_bulk_size_boundary(struct rtw_adapter *padapter, int rtl8723au_inirp_init(struct rtw_adapter *Adapter); int rtl8723au_inirp_deinit(struct rtw_adapter *Adapter); +void rtl8723au_chip_configure(struct rtw_adapter *padapter); #endif /* __USB_OPS_H_ */ diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c index d80c35544d33..a3379b7fa178 100644 --- a/drivers/staging/rtl8723au/os_dep/usb_intf.c +++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c @@ -629,7 +629,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, rtl8723a_read_chip_version(padapter); /* step usb endpoint mapping */ - rtw_hal_chip_configure23a(padapter); + rtl8723au_chip_configure(padapter); /* step read efuse/eeprom data and get mac_addr */ rtl8723a_read_adapter_info(padapter);