openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging:r8188eu: remove wrappers for rtw_hal_inirp_init function 

There is no reason to use these wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov 2016-10-08 01:01:01 +07:00 committed by Greg Kroah-Hartman
parent bb5cd2e531
commit 4f1ca4d093
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8188eu/include/drv_types.h
View File

@ -156,7 +156,6 @@ struct adapter {
u8 hw_init_completed; u8 hw_init_completed;
void *cmdThread; void *cmdThread;
void (*intf_start)(struct adapter *adapter);
void (*intf_stop)(struct adapter *adapter); void (*intf_stop)(struct adapter *adapter);
struct net_device *pnetdev; struct net_device *pnetdev;
struct net_device *pmondev; struct net_device *pmondev;

6
drivers/staging/rtl8188eu/os_dep/os_intfs.c
View File

@ -596,8 +596,7 @@ static int _netdev_open(struct net_device *pnetdev)
pr_info("can't init mlme_ext_priv\n"); pr_info("can't init mlme_ext_priv\n");
goto netdev_open_error; goto netdev_open_error;
} }
if (padapter->intf_start) rtw_hal_inirp_init(padapter);
padapter->intf_start(padapter);
rtw_led_control(padapter, LED_CTL_NO_LINK); rtw_led_control(padapter, LED_CTL_NO_LINK);
@ -658,8 +657,7 @@ static int ips_netdrv_open(struct adapter *padapter)
goto netdev_open_error; goto netdev_open_error;
} }
if (padapter->intf_start) rtw_hal_inirp_init(padapter);
padapter->intf_start(padapter);
rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv); rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
mod_timer(&padapter->mlmepriv.dynamic_chk_timer, mod_timer(&padapter->mlmepriv.dynamic_chk_timer,

10
drivers/staging/rtl8188eu/os_dep/usb_intf.c
View File

@ -141,15 +141,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
} }
static void usb_intf_start(struct adapter *padapter)
{
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));
rtw_hal_inirp_init(padapter);
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_start\n"));
}
static void usb_intf_stop(struct adapter *padapter) static void usb_intf_stop(struct adapter *padapter)
{ {
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n")); RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
@ -366,7 +357,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
if (!padapter->HalData) if (!padapter->HalData)
DBG_88E("cant not alloc memory for HAL DATA\n"); DBG_88E("cant not alloc memory for HAL DATA\n");
padapter->intf_start = &usb_intf_start;
padapter->intf_stop = &usb_intf_stop; padapter->intf_stop = &usb_intf_stop;
/* step read_chip_version */ /* step read_chip_version */