staging: r8188eu: remove struct intf_hdl
authorMartin Kaiser <martin@kaiser.cx>
Mon, 23 Jan 2023 20:53:22 +0000 (21:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jan 2023 09:10:35 +0000 (10:10 +0100)
There are no more users of struct intf_hdl in the r8188eu driver. We can
now remove this struct.

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/20230123205342.229589-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/include/drv_types.h
drivers/staging/r8188eu/include/rtw_io.h
drivers/staging/r8188eu/os_dep/usb_intf.c

index 6146739023779af079749bd75e24bbff16bddf02..7b170eed66b32e395685a7126e0f45a208ed01b6 100644 (file)
@@ -152,7 +152,6 @@ struct adapter {
        struct  mlme_ext_priv mlmeextpriv;
        struct  cmd_priv        cmdpriv;
        struct  evt_priv        evtpriv;
-       struct  intf_hdl        intf;
        struct  xmit_priv       xmitpriv;
        struct  recv_priv       recvpriv;
        struct  sta_priv        stapriv;
index 0d2aa432f88dfef96d52d805da26c25664018354..033ea7146861f4c2d0d0cda8a64d5b61275fc27b 100644 (file)
 #include <linux/usb/ch9.h>
 
 struct intf_priv;
-struct intf_hdl;
-
-struct intf_hdl {
-       struct adapter *padapter;
-       struct dvobj_priv *pintf_dev;
-};
 
 int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data);
 int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data);
index 1f70e5fee1b2ef522b52bbd732733257a38e1971..1f114b1fc4d5efa7405825f82d69effbced3e937 100644 (file)
@@ -290,7 +290,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb
 {
        struct adapter *padapter = NULL;
        struct net_device *pnetdev = NULL;
-       struct intf_hdl *pintf;
        int ret;
 
        padapter = vzalloc(sizeof(*padapter));
@@ -317,11 +316,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb
        padapter->intf_start = &usb_intf_start;
        padapter->intf_stop = &usb_intf_stop;
 
-       /* step init_io_priv */
-       pintf = &padapter->intf;
-       pintf->padapter = padapter;
-       pintf->pintf_dev = adapter_to_dvobj(padapter);
-
        /* step read_chip_version */
        rtl8188e_read_chip_version(padapter);