staging: r8188eu: remove struct io_priv

struct io_priv has only one member (and a pointer to the enclosing struct
adapter). We can remove struct io_priv and move its member directly into
struct adapter.

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/20230111195640.306748-2-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index ff784a8..c6a4353 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -95,8 +95,7 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size)
 
 int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
 
        return usb_read(intf, value, data, 1);
@@ -104,8 +103,7 @@ int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data)
 
 int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
        __le16 le_data;
        int res;
@@ -121,8 +119,7 @@ int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data)
 
 int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
        __le32 le_data;
        int res;
@@ -138,8 +135,7 @@ int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data)
 
 int rtw_write8(struct adapter *adapter, u32 addr, u8 val)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
        int ret;
 
@@ -150,8 +146,7 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val)
 
 int rtw_write16(struct adapter *adapter, u32 addr, u16 val)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
        __le16 data = cpu_to_le16(val);
        int ret;
@@ -163,8 +158,7 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val)
 
 int rtw_write32(struct adapter *adapter, u32 addr, u32 val)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
        __le32 data = cpu_to_le32(val);
        int ret;
@@ -176,8 +170,7 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val)
 
 int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data)
 {
-       struct io_priv *io_priv = &adapter->iopriv;
-       struct intf_hdl *intf = &io_priv->intf;
+       struct intf_hdl *intf = &adapter->intf;
        u16 value = addr & 0xffff;
 
        if (length > VENDOR_CMD_MAX_DATA_LEN)

diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 4803d0c..6146739 100644 (file)
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -152,7 +152,7 @@ struct adapter {
        struct  mlme_ext_priv mlmeextpriv;
        struct  cmd_priv        cmdpriv;
        struct  evt_priv        evtpriv;
-       struct  io_priv iopriv;
+       struct  intf_hdl        intf;
        struct  xmit_priv       xmitpriv;
        struct  recv_priv       recvpriv;
        struct  sta_priv        stapriv;

diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h
index e974469..c15b2e8 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_io.h
+++ b/drivers/staging/r8188eu/include/rtw_io.h
@@ -203,11 +203,6 @@ struct io_queue {
        struct  intf_hdl        intf;
 };
 
-struct io_priv {
-       struct adapter *padapter;
-       struct intf_hdl intf;
-};
-
 uint ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue);
 void sync_ioreq_enqueue(struct io_req *preq, struct io_queue *ioqueue);
 uint sync_ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue);

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 5fbfbcd..1f70e5f 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -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 io_priv *piopriv;
        struct intf_hdl *pintf;
        int ret;
 
@@ -319,9 +318,7 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb
        padapter->intf_stop = &usb_intf_stop;
 
        /* step init_io_priv */
-       piopriv = &padapter->iopriv;
-       pintf = &piopriv->intf;
-       piopriv->padapter = padapter;
+       pintf = &padapter->intf;
        pintf->padapter = padapter;
        pintf->pintf_dev = adapter_to_dvobj(padapter);