From: Martin Kaiser Date: Wed, 7 Apr 2021 17:05:29 +0000 (+0200) Subject: staging: rtl8188eu: rtw_usb_if1_init needs no dvobj parameter X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=57ae96149e8967ab1043dc1351966ac61b620978;p=linux.git staging: rtl8188eu: rtw_usb_if1_init needs no dvobj parameter rtw_usb_if1_init receives a pointer to struct usb_interface. dvobj is the interface data for this interface. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20210407170531.29356-8-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c index f173db5e7db92..301dab65b571f 100644 --- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c +++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c @@ -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; }