From 44e621c7a6234f5913ba315866712585fe6bc3e4 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 16 May 2014 10:04:04 +0200 Subject: [PATCH] staging: rtl8723au: Remove HAL wrappers around read_chip_version Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/hal/hal_intf.c | 6 ------ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 11 +---------- drivers/staging/rtl8723au/include/hal_intf.h | 4 ---- drivers/staging/rtl8723au/include/rtl8723a_hal.h | 1 + drivers/staging/rtl8723au/os_dep/usb_intf.c | 2 +- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c index d9be03dfd28d..81faaa579e37 100644 --- a/drivers/staging/rtl8723au/hal/hal_intf.c +++ b/drivers/staging/rtl8723au/hal/hal_intf.c @@ -28,12 +28,6 @@ void rtw_hal_chip_configure23a(struct rtw_adapter *padapter) padapter->HalFunc.intf_chip_configure(padapter); } -void rtw_hal_read_chip_version23a(struct rtw_adapter *padapter) -{ - if (padapter->HalFunc.read_chip_version) - padapter->HalFunc.read_chip_version(padapter); -} - void rtw_hal_free_data23a(struct rtw_adapter *padapter) { if (padapter->HalFunc.free_hal_data) diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c index 681eee57c569..b2e2734f26c4 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c @@ -1387,7 +1387,7 @@ Hal_EfusePgPacketWrite_BT(struct rtw_adapter *pAdapter, return true; } -static struct hal_version ReadChipVersion8723A(struct rtw_adapter *padapter) +void rtl8723a_read_chip_version(struct rtw_adapter *padapter) { u32 value32; struct hal_version ChipVersion; @@ -1433,13 +1433,6 @@ static struct hal_version ReadChipVersion8723A(struct rtw_adapter *padapter) pHalData->rf_type = RF_1T1R; MSG_8723A("RF_Type is %x!!\n", pHalData->rf_type); - - return ChipVersion; -} - -static void rtl8723a_read_chip_version(struct rtw_adapter *padapter) -{ - ReadChipVersion8723A(padapter); } /* */ @@ -1723,8 +1716,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc) { pHalFunc->free_hal_data = &rtl8723a_free_hal_data; - pHalFunc->read_chip_version = &rtl8723a_read_chip_version; - pHalFunc->set_bwmode_handler = &PHY_SetBWMode23a8723A; pHalFunc->set_channel_handler = &PHY_SwChnl8723A; diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index 89cee4df1bc0..b25a8a07d2ee 100644 --- a/drivers/staging/rtl8723au/include/hal_intf.h +++ b/drivers/staging/rtl8723au/include/hal_intf.h @@ -78,8 +78,6 @@ struct hal_ops { void (*InitSwLeds)(struct rtw_adapter *padapter); void (*DeInitSwLeds)(struct rtw_adapter *padapter); - void (*read_chip_version)(struct rtw_adapter *padapter); - void (*intf_chip_configure)(struct rtw_adapter *padapter); void (*enable_interrupt)(struct rtw_adapter *padapter); @@ -189,8 +187,6 @@ 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); -void rtw_hal_read_chip_info23a(struct rtw_adapter *padapter); -void rtw_hal_read_chip_version23a(struct rtw_adapter *padapter); u8 rtw_hal_set_def_var23a(struct rtw_adapter *padapter, enum hal_def_variable eVariable, diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h index 88a79dfb87c5..a1045ab0e1b0 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h @@ -547,6 +547,7 @@ s32 c2h_id_filter_ccx_8723a(u8 id); s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt); void rtl8723a_read_adapter_info(struct rtw_adapter *Adapter); +void rtl8723a_read_chip_version(struct rtw_adapter *padapter); void rtl8723a_notch_filter(struct rtw_adapter *adapter, bool enable); #endif diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c index 09d0892b6bc5..26f5523be719 100644 --- a/drivers/staging/rtl8723au/os_dep/usb_intf.c +++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c @@ -626,7 +626,7 @@ static struct rtw_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, rtl8723au_set_intf_ops(padapter); /* step read_chip_version */ - rtw_hal_read_chip_version23a(padapter); + rtl8723a_read_chip_version(padapter); /* step usb endpoint mapping */ rtw_hal_chip_configure23a(padapter); -- 2.30.2