From 02d50c22bdedec15998ca1a83141aae9b79b1022 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 16 May 2014 10:04:23 +0200 Subject: [PATCH] staging: rtl8723au: Remove sw led hal ops Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/hal/hal_intf.c | 12 ------------ drivers/staging/rtl8723au/hal/usb_halinit.c | 5 ----- drivers/staging/rtl8723au/include/drv_types.h | 1 - drivers/staging/rtl8723au/include/hal_intf.h | 8 -------- drivers/staging/rtl8723au/os_dep/os_intfs.c | 3 --- 5 files changed, 29 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c index 1d47539c220e..cc1b1eac5b89 100644 --- a/drivers/staging/rtl8723au/hal/hal_intf.c +++ b/drivers/staging/rtl8723au/hal/hal_intf.c @@ -22,18 +22,6 @@ #include #include -void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter) -{ - if (padapter->HalFunc.InitSwLeds) - padapter->HalFunc.InitSwLeds(padapter); -} - -void rtw_hal_sw_led_deinit23a(struct rtw_adapter *padapter) -{ - if (padapter->HalFunc.DeInitSwLeds) - padapter->HalFunc.DeInitSwLeds(padapter); -} - void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level) { struct rtw_adapter *padapter; diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c index be98560f1e4f..5ecd7f339f82 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -1694,16 +1694,11 @@ int rtw_hal_deinit23a(struct rtw_adapter *padapter) int rtl8723au_set_hal_ops(struct rtw_adapter *padapter) { - struct hal_ops *pHalFunc = &padapter->HalFunc; - padapter->HalData = kzalloc(sizeof(struct hal_data_8723a), GFP_KERNEL); if (!padapter->HalData) { DBG_8723A("cannot alloc memory for HAL DATA\n"); return -ENOMEM; } - pHalFunc->InitSwLeds = NULL; - pHalFunc->DeInitSwLeds = NULL; - return 0; } diff --git a/drivers/staging/rtl8723au/include/drv_types.h b/drivers/staging/rtl8723au/include/drv_types.h index e31e6ea56f54..3f2252301139 100644 --- a/drivers/staging/rtl8723au/include/drv_types.h +++ b/drivers/staging/rtl8723au/include/drv_types.h @@ -239,7 +239,6 @@ struct rtw_adapter { u32 setband; void *HalData; - struct hal_ops HalFunc; s32 bDriverStopped; s32 bSurpriseRemoved; diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index b2dcd1da9713..04223b5c047d 100644 --- a/drivers/staging/rtl8723au/include/hal_intf.h +++ b/drivers/staging/rtl8723au/include/hal_intf.h @@ -60,11 +60,6 @@ enum hal_odm_variable { HAL_ODM_WIFI_DISPLAY_STATE, }; -struct hal_ops { - void (*InitSwLeds)(struct rtw_adapter *padapter); - void (*DeInitSwLeds)(struct rtw_adapter *padapter); -}; - enum rt_eeprom_type { EEPROM_93C46, EEPROM_93C56, @@ -108,9 +103,6 @@ void rtw_hal_def_value_init23a(struct rtw_adapter *padapter); int pm_netdev_open23a(struct net_device *pnetdev, u8 bnormal); int rtw_resume_process23a(struct rtw_adapter *padapter); -void rtw_hal_sw_led_init23a(struct rtw_adapter *padapter); -void rtw_hal_sw_led_deinit23a(struct rtw_adapter *padapter); - int rtw_hal_init23a(struct rtw_adapter *padapter); int rtw_hal_deinit23a(struct rtw_adapter *padapter); void rtw_hal_stop(struct rtw_adapter *padapter); diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c index 3a455d111a33..1a253a0a372e 100644 --- a/drivers/staging/rtl8723au/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c @@ -523,7 +523,6 @@ u8 rtw_init_drv_sw23a(struct rtw_adapter *padapter) ret8 = rtw_init_default_value(padapter); rtl8723a_init_dm_priv(padapter); - rtw_hal_sw_led_init23a(padapter); rtw_sreset_init(padapter); @@ -549,8 +548,6 @@ void rtw_cancel_all_timer23a(struct rtw_adapter *padapter) RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer23a:cancel dynamic_chk_timer!\n")); - /* cancel sw led timer */ - rtw_hal_sw_led_deinit23a(padapter); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("rtw_cancel_all_timer23a:cancel DeInitSwLeds!\n")); -- 2.39.5