staging: rtl8188eu: rtw_usb_if1_init needs no dvobj parameter
authorMartin Kaiser <martin@kaiser.cx>
Wed, 7 Apr 2021 17:05:29 +0000 (19:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Apr 2021 07:26:32 +0000 (09:26 +0200)
rtw_usb_if1_init receives a pointer to struct usb_interface. dvobj is the
interface data for this interface.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210407170531.29356-8-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/os_dep/usb_intf.c

index f173db5..301dab6 100644 (file)
@@ -322,9 +322,9 @@ static int rtw_resume(struct usb_interface *pusb_intf)
  *        We accept the new device by returning 0.
  */
 
-static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
-                                       struct usb_interface *pusb_intf)
+static struct adapter *rtw_usb_if1_init(struct usb_interface *pusb_intf)
 {
+       struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
        struct adapter *padapter;
        struct net_device *pnetdev;
        struct net_device *pmondev;
@@ -460,7 +460,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
                goto exit;
        }
 
-       if (!rtw_usb_if1_init(dvobj, pusb_intf)) {
+       if (!rtw_usb_if1_init(pusb_intf)) {
                pr_debug("rtw_usb_if1_init failed\n");
                goto free_dvobj;
        }