staging: r8188eu: remove intf_start pointer

Remove the intf_start pointer that points to a media-specific start
function (pci, usb, sdio, ...). The r8188eu driver supports only usb.

We could call usb_intf_start directly instead of going through the
function pointer. usb_intf_start is just a call to rtl8188eu_inirp_init so
we can directly replace the intf_start pointer with rtl8188eu_inirp_init.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230206201800.139195-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 7b170eed66b32e395685a7126e0f45a208ed01b6..40f13f18589518cf4d5c5d9ff82610bf1db65776 100644 (file)
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -171,7 +171,6 @@ struct adapter {
        s8      signal_strength;
 
        void *cmdThread;
-       void (*intf_start)(struct adapter *adapter);
        void (*intf_stop)(struct adapter *adapter);
        struct  net_device *pnetdev;
 

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 4130e8fe29522136b89221df1e56fe868d932153..e48dbdfefedbe8e6b52195396ee288d8512e8324 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -631,8 +631,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);
+               rtl8188eu_inirp_init(padapter);
 
                rtw_led_control(padapter, LED_CTL_NO_LINK);
 
@@ -684,8 +683,7 @@ static int  ips_netdrv_open(struct adapter *padapter)
        if (status == _FAIL)
                goto netdev_open_error;
 
-       if (padapter->intf_start)
-               padapter->intf_start(padapter);
+       rtl8188eu_inirp_init(padapter);
 
        rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
        _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 5000);

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 1f114b1fc4d5efa7405825f82d69effbced3e937..ca9a7c0e5159a270047c8f4f77874aecd58ccd18 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -152,11 +152,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
 
 }
 
-static void usb_intf_start(struct adapter *padapter)
-{
-       rtl8188eu_inirp_init(padapter);
-}
-
 static void usb_intf_stop(struct adapter *padapter)
 {
        /* cancel in irp */
@@ -313,7 +308,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb
        SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj));
        padapter = rtw_netdev_priv(pnetdev);
 
-       padapter->intf_start = &usb_intf_start;
        padapter->intf_stop = &usb_intf_stop;
 
        /* step read_chip_version */