diff options
| author | Ivan Safonov <insafonov@gmail.com> | 2016-09-18 17:26:16 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-20 11:33:49 (GMT) |
| commit | 6955832f1375eb29b005128c51df0b73c209fcba (patch) | |
| tree | 4fcb03989fa5c46700700c3b8959ff76cf7d3e2b | |
| parent | fb1134087568dad2b974669ebcee09718b7fdc80 (diff) | |
| download | linux-6955832f1375eb29b005128c51df0b73c209fcba.tar.xz | |
staging: r8188eu: remove rtl8188eu_set_hal_ops function
rtl8188eu_set_hal_ops only allocates
HalData member of adapter structure.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8188eu/hal/usb_halinit.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/usb_hal.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/os_dep/usb_intf.c | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index cc27d64..a3c4334 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -2040,10 +2040,3 @@ void rtw_hal_def_value_init(struct adapter *adapt) for (i = 0; i < HP_THERMAL_NUM; i++) haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0; } - -void rtl8188eu_set_hal_ops(struct adapter *adapt) -{ - adapt->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL); - if (!adapt->HalData) - DBG_88E("cant not alloc memory for HAL DATA\n"); -} diff --git a/drivers/staging/rtl8188eu/include/usb_hal.h b/drivers/staging/rtl8188eu/include/usb_hal.h index fd9921f..3bcf74f 100644 --- a/drivers/staging/rtl8188eu/include/usb_hal.h +++ b/drivers/staging/rtl8188eu/include/usb_hal.h @@ -15,6 +15,4 @@ #ifndef __USB_HAL_H__ #define __USB_HAL_H__ -void rtl8188eu_set_hal_ops(struct adapter *padapter); - #endif /* __USB_HAL_H__ */ diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c index cf33f65..3da2ab0 100644 --- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c +++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c @@ -28,6 +28,8 @@ #include <usb_hal.h> #include <rtw_ioctl.h> +#include "rtl8188e_hal.h" + #define USB_VENDER_ID_REALTEK 0x0bda /* DID_USB_v916_20130116 */ @@ -361,8 +363,9 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, padapter->pmondev = pmondev; } - /* step 2. hook HalFunc, allocate HalData */ - rtl8188eu_set_hal_ops(padapter); + padapter->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL); + if (!padapter->HalData) + DBG_88E("cant not alloc memory for HAL DATA\n"); padapter->intf_start = &usb_intf_start; padapter->intf_stop = &usb_intf_stop; |