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>

diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 32326fd1dd24f64800749399e7642ccab8de4634..5eb56b1281d23dfcbf7b23efd5bdcd7e9619c8c0 100644 (file)
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -156,7 +156,6 @@ struct adapter {
        u8      hw_init_completed;
 
        void *cmdThread;
-       void (*intf_start)(struct adapter *adapter);
        void (*intf_stop)(struct adapter *adapter);
        struct  net_device *pnetdev;
        struct  net_device *pmondev;

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 40691f1ec5070ec49854acadaa0ab5b03c9336d8..8d96e51bd4c7c9dedf7b592414c32c231383a70b 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -596,8 +596,7 @@ static int _netdev_open(struct net_device *pnetdev)
                        pr_info("can't init mlme_ext_priv\n");
                        goto netdev_open_error;
                }
-               if (padapter->intf_start)
-                       padapter->intf_start(padapter);
+               rtw_hal_inirp_init(padapter);
 
                rtw_led_control(padapter, LED_CTL_NO_LINK);
 
@@ -658,8 +657,7 @@ static int  ips_netdrv_open(struct adapter *padapter)
                goto netdev_open_error;
        }
 
-       if (padapter->intf_start)
-               padapter->intf_start(padapter);
+       rtw_hal_inirp_init(padapter);
 
        rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
        mod_timer(&padapter->mlmepriv.dynamic_chk_timer,

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 68e1e6bbe87f162ee44576216aeee2787661d0b3..49963327b0c82e2b7ec54f97b96e83dd2464b927 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -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)
 {
        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)
                DBG_88E("cant not alloc memory for HAL DATA\n");
 
-       padapter->intf_start = &usb_intf_start;
        padapter->intf_stop = &usb_intf_stop;
 
        /* step read_chip_version */