staging: r8188eu: Shorten and simplify calls chain
v5 cover staging: r8188eu: Shorten and simplify calls chain
io_ops abstraction is useless in this driver, since there is only one ops registration. Without io_ops we can get rid of indirect calls mess and shorten the calls chain.
Shorten the calls chain of rtw_read8/16/32() down to the actual reads. For this purpose unify the three usb_read8/16/32 into the new usb_read(); make the latter parameterizable with 'size'; embed most of the code of usbctrl_vendorreq() into usb_read() and use in it the new usb_control_msg_recv() API of USB Core.
Shorten the calls chain of rtw_write8/16/32() down to the actual writes. For this purpose unify the four usb_write8/16/32/N() into the new usb_write(); make the latter parameterizable with 'size'; embed most of the code of usbctrl_vendorreq() into usb_write() and use in it the new usb_control_msg_send() API of USB Core.
The code with the modifications was thoroughly tested by Pavel Skripkin using a TP-Link TL-WN722N v2 / v3 [Realtek RTL8188EUS] and by Fabio M. De Francesco using a ASUSTek Computer, Inc. Realtek 8188EUS [USB-N10 Nano].
Changelog:
v4->v5:
- 1-14:
No changes;
- 15-16:
Fix minor formatting issues and use "Reverse Xmas Tree" style, according to suggestions by David Laight and Dan Carpenter;
- 17-18:
Pavel Skripkin found logical errors in the checks of the values returned by usb_control_msg_{recv,send}(), so fix them; Dan Carpenter suggested to do error handling before success handling, so change the code accordingly;
- 19:
Add this patch in order to get rid of the shared buffer in usb_read() and usb_write() and remove this field from struct "dvobj_priv".
v3->v4:
- 1-14:
Split a patch into fourteen;
- 15-16:
Add these patches for clean-ups of the code that is going to be reused in 17-18/18;
- 17-18:
Make some changes according to a first review of Greg Kroah-Hartman; furthermore, remove the unnecessary while loop and a couple of if' test; handle the errors returned by usb_control_msg_recv().
v2->v3:
- 1:
No changes;
- 3:
Fix the version number of the patch.
v1->v2:
- 1:
No changes;
- 3:
Replace parameter REALTEK_USB_VENQT_READ with REALTEK_USB_VENQT_WRITE in usb_control_msg_send(). More in-depth explanation at
https://lore.kernel.org/lkml/[email protected]/T/#m1fc1ab2f7c1f463049ad88d5df5bb1b107b37260
v1: https://lore.kernel.org/lkml/[email protected]/
v2: https://lore.kernel.org/lkml/[email protected]/
v3: https://lore.kernel.org/lkml/[email protected]/
v4: https://lore.kernel.org/lkml/[email protected]/
Fabio M. De Francesco (4):
staging: r8188eu: hal: Clean up usbctrl_vendorreq()
staging: r8188eu: hal: Clean up rtw_read*() and rtw_write*()
staging: r8188eu: Shorten calls chain of rtw_read8/16/32()
staging: r8188eu: Shorten calls chain of rtw_write8/16/32/N()
Pavel Skripkin (15):
staging: r8188eu: remove usb_{read,write}_mem
staging: r8188eu: remove the helpers of rtw_read8()
staging: r8188eu: remove the helpers of rtw_read16()
staging: r8188eu: remove the helpers of rtw_read32()
staging: r8188eu: remove the helpers of usb_write8
staging: r8188eu: remove the helpers of usb_write16
staging: r8188eu: remove the helpers of usb_write32
staging: r8188eu: remove the helpers of usb_writeN
staging: r8188eu: remove the helpers of usb_read_port
staging: r8188eu: remove the helpers of usb_write_port
staging: r8188eu: remove the helpers of usb_read_port_cancel
staging: r8188eu: remove the helpers of usb_write_port_cancel
staging: r8188eu: remove core/rtw_io.c
staging: remove struct _io_ops
staging: r8188eu: remove shared buffer for usb requests
drivers/staging/r8188eu/Makefile | 1 - drivers/staging/r8188eu/core/rtw_io.c | 299 ------------------ drivers/staging/r8188eu/hal/usb_halinit.c | 6 +- drivers/staging/r8188eu/hal/usb_ops_linux.c | 261 ++++++++------- drivers/staging/r8188eu/include/drv_types.h | 5 - drivers/staging/r8188eu/include/rtw_io.h | 89 +----- drivers/staging/r8188eu/include/usb_ops.h | 2 - .../staging/r8188eu/include/usb_ops_linux.h | 8 - drivers/staging/r8188eu/os_dep/usb_intf.c | 37 +-- .../staging/r8188eu/os_dep/usb_ops_linux.c | 20 +- 10 files changed, 166 insertions(+), 562 deletions(-) delete mode 100644 drivers/staging/r8188eu/core/rtw_io.c
Signature · 1 line
2.33.0
PATCH v5 1/19 staging: r8188eu: remove usb_{read,write}_mem
From: Pavel Skripkin <[email protected]>
Remove usb_{read,write}_mem() because they are unused.
--- drivers/staging/r8188eu/core/rtw_io.c | 29 ------------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 -- drivers/staging/r8188eu/include/rtw_io.h | 4 --- .../staging/r8188eu/include/usb_ops_linux.h | 3 -- .../staging/r8188eu/os_dep/usb_ops_linux.c | 8 ----- 5 files changed, 46 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -29
@@ -175,35 +175,6 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -void _rtw_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -void (*_read_mem)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; - - -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) -return ; - _read_mem = pintfhdl->io_ops._read_mem; -_read_mem (pintfhdl, addr, cnt, pmem); - -} - -void _rtw_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -void (*_write_mem)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; - - - - _write_mem = pintfhdl->io_ops._write_mem; - -_write_mem (pintfhdl, addr, cnt, pmem); - - -} -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) {u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -2
@@ -541,13 +541,11 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_read8 = &usb_read8; pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; - pops->_read_mem = &usb_read_mem; pops->_read_port = &usb_read_port; pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; pops->_writeN = &usb_writeN; - pops->_write_mem = &usb_write_mem; pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;
drivers/staging/r8188eu/include/rtw_io.h +0 -4
@@ -270,8 +270,6 @@ void _rtw_write_port_cancel(struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr)) -#define rtw_read_mem (adapter, addr, cnt, mem) \ - _rtw_read_mem((adapter), (addr), (cnt), (mem))#define rtw_read_port (adapter, addr, cnt, mem) \ _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter))
@@ -290,8 +288,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16_async((adapter), (addr), (val))#define rtw_write32_async (adapter, addr, val) \ _rtw_write32_async((adapter), (addr), (val)) -#define rtw_write_mem (adapter, addr, cnt, mem) \ - _rtw_write_mem((adapter), (addr), (cnt), (mem))#define rtw_write_port (adapter, addr, cnt, mem) \ _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \
drivers/staging/r8188eu/include/usb_ops_linux.h +0 -3
@@ -28,9 +28,6 @@unsigned int ffaddr2pipehdl (struct dvobj_priv *pdvobj,u32 addr); -void usb_read_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *rmem); -void usb_write_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem); -void usb_read_port_cancel (struct intf_hdl *pintfhdl);u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem);
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +0 -8
@@ -31,14 +31,6 @@ struct zero_bulkout_context {void *padapter; }; -void usb_read_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *rmem) -{ -} - -void usb_write_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem) -{ -} -void usb_read_port_cancel (struct intf_hdl *pintfhdl) {int i;
Signature · 1 line
2.33.0
PATCH v5 2/19 staging: r8188eu: remove the helpers of rtw_read8()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_read8() and usb_read8() and embed their code into the caller (i.e., rtw_read8()).
_rtw_read8() is a mere redefinition of rtw_read8() and it is unneeded. usb_read8() was the only functions assigned to (*_usb_read8) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 14 -------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 5 +++-- drivers/staging/r8188eu/include/rtw_io.h | 3 +-- 3 files changed, 4 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -14
@@ -34,20 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -u8 _rtw_read8 (struct adapter *adapter,u32 addr) -{ -u8 r_val; -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); - - - _read8 = pintfhdl->io_ops._read8; - r_val =_read8 (pintfhdl, addr); - -return r_val; -} -u16 _rtw_read16 (struct adapter *adapter,u32 addr) {u16 r_val;
drivers/staging/r8188eu/hal/usb_ops_linux.c +3 -2
@@ -97,8 +97,10 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,return status; } -static u8 usb_read8 (struct intf_hdl *pintfhdl,u32 addr) +u8 rtw_read8 (struct adapter *adapter,u32 addr) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff );u8 data;
@@ -538,7 +540,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read8 = &usb_read8; pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; pops->_read_port = &usb_read_port;
drivers/staging/r8188eu/include/rtw_io.h +1 -2
@@ -245,7 +245,7 @@ void unregister_intf_hdl(struct intf_hdl *pintfhdl);void _rtw_attrib_read (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_attrib_write (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -u8 _rtw_read8 (struct adapter *adapter,u32 addr); +u8 rtw_read8 (struct adapter *adapter,u32 addr);u16 _rtw_read16 (struct adapter *adapter,u32 addr);u32 _rtw_read32 (struct adapter *adapter,u32 addr);void _rtw_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);
@@ -267,7 +267,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter); -#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr))#define rtw_read_port (adapter, addr, cnt, mem) \
Signature · 1 line
2.33.0
PATCH v5 3/19 staging: r8188eu: remove the helpers of rtw_read16()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_read16() and usb_read16() and embed their code into the caller (i.e., rtw_read16()).
_rtw_read16() is a mere redefinition of rtw_read16() and it is unneeded. usb_read16() was the only functions assigned to the (*_usb_read16) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 14 -------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 5 +++-- drivers/staging/r8188eu/include/rtw_io.h | 3 +-- 3 files changed, 4 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -14
@@ -34,20 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -u16 _rtw_read16 (struct adapter *adapter,u32 addr) -{ -u16 r_val; -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 (*_read16)(struct intf_hdl *pintfhdl,u32 addr); - - _read16 = pintfhdl->io_ops._read16; - - r_val =_read16 (pintfhdl, addr); - -return r_val; -} -u32 _rtw_read32 (struct adapter *adapter,u32 addr) {u32 r_val;
drivers/staging/r8188eu/hal/usb_ops_linux.c +3 -2
@@ -109,8 +109,10 @@ u8 rtw_read8(struct adapter *adapter, u32 addr)return data; } -static u16 usb_read16 (struct intf_hdl *pintfhdl,u32 addr) +u16 rtw_read16 (struct adapter *adapter,u32 addr) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff );__le32 data;
@@ -540,7 +542,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; pops->_read_port = &usb_read_port; pops->_write8 = &usb_write8;
drivers/staging/r8188eu/include/rtw_io.h +1 -2
@@ -246,7 +246,7 @@ void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);void _rtw_attrib_write (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u8 rtw_read8 (struct adapter *adapter,u32 addr); -u16 _rtw_read16 (struct adapter *adapter,u32 addr); +u16 rtw_read16 (struct adapter *adapter,u32 addr);u32 _rtw_read32 (struct adapter *adapter,u32 addr);void _rtw_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);
@@ -267,7 +267,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter); -#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr))#define rtw_read_port (adapter, addr, cnt, mem) \ _rtw_read_port((adapter), (addr), (cnt), (mem))
Signature · 1 line
2.33.0
PATCH v5 4/19 staging: r8188eu: remove the helpers of rtw_read32()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_readr32() and usb_read32() and embed their code into the caller (i.e., rtw_read32()).
_rtw_read32() is a mere redefinition of rtw_read32() and it is unneeded. usb_read32() was the only functions assigned to the (*_usb_read32) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 14 -------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 5 +++-- drivers/staging/r8188eu/include/rtw_io.h | 3 +-- 3 files changed, 4 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -14
@@ -34,20 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -u32 _rtw_read32 (struct adapter *adapter,u32 addr) -{ -u32 r_val; -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u32 (*_read32)(struct intf_hdl *pintfhdl,u32 addr); - - _read32 = pintfhdl->io_ops._read32; - - r_val =_read32 (pintfhdl, addr); - -return r_val; -} -int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val) {struct io_priv *pio_priv = &adapter->iopriv;
drivers/staging/r8188eu/hal/usb_ops_linux.c +3 -2
@@ -121,8 +121,10 @@ u16 rtw_read16(struct adapter *adapter, u32 addr)return (u16)(le32_to_cpu (data) &0xffff ); } -static u32 usb_read32 (struct intf_hdl *pintfhdl,u32 addr) +u32 rtw_read32 (struct adapter *adapter,u32 addr) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff );__le32 data;
@@ -542,7 +544,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read32 = &usb_read32; pops->_read_port = &usb_read_port; pops->_write8 = &usb_write8; pops->_write16 = &usb_write16;
drivers/staging/r8188eu/include/rtw_io.h +1 -2
@@ -247,7 +247,7 @@ void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);u8 rtw_read8 (struct adapter *adapter,u32 addr);u16 rtw_read16 (struct adapter *adapter,u32 addr); -u32 _rtw_read32 (struct adapter *adapter,u32 addr); +u32 rtw_read32 (struct adapter *adapter,u32 addr);void _rtw_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_read_port_cancel (struct adapter *adapter);
@@ -267,7 +267,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter); -#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr))#define rtw_read_port (adapter, addr, cnt, mem) \ _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter))
Signature · 1 line
2.33.0
PATCH v5 5/19 staging: r8188eu: remove the helpers of usb_write8
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_write8() and usb_write8() and embed their code into the caller (i.e., rtw_write8()).
_rtw_write8() is a mere redefinition of rtw_write8() and it is unneeded. usb_write8() was the only functions assigned to the (*_usb_write8) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 15 --------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +++++++--- drivers/staging/r8188eu/include/rtw_io.h | 4 +--- 3 files changed, 8 insertions(+), 21 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -15
@@ -34,21 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -int (*_write8)(struct intf_hdl *pintfhdl,u32 addr,u8 val); -int ret; - - _write8 = pintfhdl->io_ops._write8; - - ret =_write8 (pintfhdl, addr, val); - - -return RTW_STATUS_CODE (ret); -} -int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val) {struct io_priv *pio_priv = &adapter->iopriv;
drivers/staging/r8188eu/hal/usb_ops_linux.c +7 -3
@@ -133,11 +133,16 @@ u32 rtw_read32(struct adapter *adapter, u32 addr)return le32_to_cpu (data); } -static int usb_write8 (struct intf_hdl *pintfhdl,u32 addr,u8 val) +int rtw_write8 (struct adapter *adapter,u32 addr,u8 val) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff ); +int ret; + + ret =usbctrl_vendorreq (pintfhdl, wvalue, &val,1 ,REALTEK_USB_VENQT_WRITE ); -return usbctrl_vendorreq (pintfhdl, wvalue, &val,1 ,REALTEK_USB_VENQT_WRITE ); +return RTW_STATUS_CODE (ret); }static int usb_write16 (struct intf_hdl *pintfhdl,u32 addr,u16 val)
@@ -545,7 +550,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); pops->_read_port = &usb_read_port; - pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; pops->_writeN = &usb_writeN;
drivers/staging/r8188eu/include/rtw_io.h +1 -3
@@ -252,7 +252,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_read_port_cancel (struct adapter *adapter); -int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val); +int rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);
@@ -271,8 +271,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter)) -#define rtw_write8 (adapter, addr, val) \ - _rtw_write8((adapter), (addr), (val))#define rtw_write16 (adapter, addr, val) \ _rtw_write16((adapter), (addr), (val))#define rtw_write32 (adapter, addr, val) \
Signature · 1 line
2.33.0
PATCH v5 6/19 staging: r8188eu: remove the helpers of usb_write16
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_write16() and usb_write16() and embed their code into the caller (i.e., rtw_write16()).
_rtw_write16() is a mere redefinition of rtw_write16() and it is unneeded. usb_write16() was the only functions assigned to the (*_usb_write16) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 14 -------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +++++++--- drivers/staging/r8188eu/include/rtw_io.h | 4 +--- 3 files changed, 8 insertions(+), 20 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -14
@@ -34,20 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -int (*_write16)(struct intf_hdl *pintfhdl,u32 addr,u16 val); -int ret; - - _write16 = pintfhdl->io_ops._write16; - - ret =_write16 (pintfhdl, addr, val); - - -return RTW_STATUS_CODE (ret); -}int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val) {struct io_priv *pio_priv = &adapter->iopriv;
drivers/staging/r8188eu/hal/usb_ops_linux.c +7 -3
@@ -145,12 +145,17 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val)return RTW_STATUS_CODE (ret); } -static int usb_write16 (struct intf_hdl *pintfhdl,u32 addr,u16 val) +int rtw_write16 (struct adapter *adapter,u32 addr,u16 val) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff );__le32 data =cpu_to_le32 (val &0x0000ffff ); +int ret; -return usbctrl_vendorreq (pintfhdl, wvalue, &data,2 ,REALTEK_USB_VENQT_WRITE ); + ret =usbctrl_vendorreq (pintfhdl, wvalue, &data,2 ,REALTEK_USB_VENQT_WRITE ); + +return RTW_STATUS_CODE (ret); }static int usb_write32 (struct intf_hdl *pintfhdl,u32 addr,u32 val)
@@ -550,7 +555,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); pops->_read_port = &usb_read_port; - pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; pops->_writeN = &usb_writeN; pops->_write_port = &usb_write_port;
drivers/staging/r8188eu/include/rtw_io.h +1 -3
@@ -253,7 +253,7 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);void _rtw_read_port_cancel (struct adapter *adapter);int rtw_write8 (struct adapter *adapter,u32 addr,u8 val); -int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val); +int rtw_write16 (struct adapter *adapter,u32 addr,u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);
@@ -271,8 +271,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter)) -#define rtw_write16 (adapter, addr, val) \ - _rtw_write16((adapter), (addr), (val))#define rtw_write32 (adapter, addr, val) \ _rtw_write32((adapter), (addr), (val))#define rtw_writeN (adapter, addr, length, data) \
Signature · 1 line
2.33.0
PATCH v5 7/19 staging: r8188eu: remove the helpers of usb_write32
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_write32() and usb_write32() and embed their code into the caller (i.e., rtw_write32()).
_rtw_write32() is a mere redefinition of rtw_write32() and it is unneeded. usb_write32() was the only functions assigned to the (*_usb_write32) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 15 --------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +++++++--- drivers/staging/r8188eu/include/rtw_io.h | 4 +--- 3 files changed, 8 insertions(+), 21 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -15
@@ -34,21 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val); -int ret; - - _write32 = pintfhdl->io_ops._write32; - - ret =_write32 (pintfhdl, addr, val); - - -return RTW_STATUS_CODE (ret); -} -int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) {struct io_priv *pio_priv = &adapter->iopriv;
drivers/staging/r8188eu/hal/usb_ops_linux.c +7 -3
@@ -158,12 +158,17 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val)return RTW_STATUS_CODE (ret); } -static int usb_write32 (struct intf_hdl *pintfhdl,u32 addr,u32 val) +int rtw_write32 (struct adapter *adapter,u32 addr,u32 val) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff );__le32 data =cpu_to_le32 (val); +int ret; -return usbctrl_vendorreq (pintfhdl, wvalue, &data,4 ,REALTEK_USB_VENQT_WRITE ); + ret =usbctrl_vendorreq (pintfhdl, wvalue, &data,4 ,REALTEK_USB_VENQT_WRITE ); + +return RTW_STATUS_CODE (ret); }static int usb_writeN (struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata)
@@ -555,7 +560,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); pops->_read_port = &usb_read_port; - pops->_write32 = &usb_write32; pops->_writeN = &usb_writeN; pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel;
drivers/staging/r8188eu/include/rtw_io.h +1 -3
@@ -254,7 +254,7 @@ void _rtw_read_port_cancel(struct adapter *adapter);int rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int rtw_write16 (struct adapter *adapter,u32 addr,u16 val); -int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val); +int rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val);
@@ -271,8 +271,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter)) -#define rtw_write32 (adapter, addr, val) \ - _rtw_write32((adapter), (addr), (val))#define rtw_writeN (adapter, addr, length, data) \ _rtw_writeN((adapter), (addr), (length), (data))#define rtw_write8_async (adapter, addr, val) \
Signature · 1 line
2.33.0
PATCH v5 8/19 staging: r8188eu: remove the helpers of usb_writeN()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_writeN() and usb_writeN() and embed their code into the caller (i.e., rtw_writeN()).
_rtw_writeN() is a mere redefinition of rtw_writeN() and it is unneeded. usb_writeN() was the only functions assigned to the (*_usb_writeN) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 14 -------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 11 +++++++---- drivers/staging/r8188eu/include/rtw_io.h | 4 +--- 3 files changed, 8 insertions(+), 21 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -14
@@ -34,20 +34,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = (struct intf_hdl *)(&pio_priv->intf); -int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata); -int ret; - - _writeN = pintfhdl->io_ops._writeN; - - ret =_writeN (pintfhdl, addr, length, pdata); - - -return RTW_STATUS_CODE (ret); -}int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val) {struct io_priv *pio_priv = &adapter->iopriv;
drivers/staging/r8188eu/hal/usb_ops_linux.c +7 -4
@@ -171,17 +171,21 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -static int usb_writeN (struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata) +int rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) { +struct io_priv *pio_priv = &adapter->iopriv; +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 wvalue = (u16)(addr &0x0000ffff );u8 buf[VENDOR_CMD_MAX_DATA_LEN ] = {0 }; +int ret;if (length >VENDOR_CMD_MAX_DATA_LEN ) -return -EINVAL ; +return _FAIL;memcpy (buf, pdata, length); + ret =usbctrl_vendorreq (pintfhdl, wvalue, buf, (length &0xffff ),REALTEK_USB_VENQT_WRITE ); -return usbctrl_vendorreq (pintfhdl, wvalue, buf, (length &0xffff ),REALTEK_USB_VENQT_WRITE ); +return RTW_STATUS_CODE (ret); }static void interrupt_handler_8188eu (struct adapter *adapt,u16 pkt_len,u8 *pbuf)
@@ -560,7 +564,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); pops->_read_port = &usb_read_port; - pops->_writeN = &usb_writeN; pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;
drivers/staging/r8188eu/include/rtw_io.h +1 -3
@@ -255,7 +255,7 @@ void _rtw_read_port_cancel(struct adapter *adapter);int rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int rtw_write16 (struct adapter *adapter,u32 addr,u16 val);int rtw_write32 (struct adapter *adapter,u32 addr,u32 val); -int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); +int rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val);int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val);
@@ -271,8 +271,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter)) -#define rtw_writeN (adapter, addr, length, data) \ - _rtw_writeN((adapter), (addr), (length), (data))#define rtw_write8_async (adapter, addr, val) \ _rtw_write8_async((adapter), (addr), (val))#define rtw_write16_async (adapter, addr, val) \
Signature · 1 line
2.33.0
PATCH v5 9/19 staging: r8188eu: remove the helpers of usb_read_port()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_read_port() and usb_read_port() and embed their code into the caller (i.e., rtw_read_port()).
_rtw_read_port() is a mere redefinition of rtw_read_port() and it is unneeded. usb_read_port() was the only functions assigned to the (*_usb_read_port) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 18 ------------------ drivers/staging/r8188eu/hal/usb_halinit.c | 6 +----- drivers/staging/r8188eu/hal/usb_ops_linux.c | 4 +--- drivers/staging/r8188eu/include/rtw_io.h | 4 +--- 4 files changed, 3 insertions(+), 29 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -18
@@ -75,24 +75,6 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; - - - -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) -return ; - - _read_port = pintfhdl->io_ops._read_port; - -_read_port (pintfhdl, addr, cnt, pmem); - - -} -void _rtw_read_port_cancel (struct adapter *adapter) {void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
drivers/staging/r8188eu/hal/usb_halinit.c +1 -5
@@ -1033,11 +1033,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)u8 i;struct recv_buf *precvbuf;uint status; -struct intf_hdl *pintfhdl = &Adapter->iopriv.intf;struct recv_priv *precvpriv = &Adapter->recvpriv; -u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); - - _read_port = pintfhdl->io_ops._read_port; status = _SUCCESS;
@@ -1046,7 +1042,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)/* issue Rx irp to receive data */ precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -if (!_read_port (pintfhdl, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf)) { +if (!rtw_read_port (Adapter, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf)) { status = _FAIL; goto exit; }
drivers/staging/r8188eu/hal/usb_ops_linux.c +1 -3
@@ -456,11 +456,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) } } -static u32 usb_read_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *rmem) +u32 rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *rmem) {struct urb *purb =NULL ;struct recv_buf *precvbuf = (struct recv_buf *)rmem; -struct adapter *adapter = pintfhdl->padapter;struct dvobj_priv *pdvobj =adapter_to_dvobj (adapter);struct recv_priv *precvpriv = &adapter->recvpriv;struct usb_device *pusbd = pdvobj->pusbdev;
@@ -563,7 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read_port = &usb_read_port; pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;
drivers/staging/r8188eu/include/rtw_io.h +1 -3
@@ -249,7 +249,7 @@ u8 rtw_read8(struct adapter *adapter, u32 addr);u16 rtw_read16 (struct adapter *adapter,u32 addr);u32 rtw_read32 (struct adapter *adapter,u32 addr);void _rtw_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +u32 rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_read_port_cancel (struct adapter *adapter);int rtw_write8 (struct adapter *adapter,u32 addr,u8 val);
@@ -267,8 +267,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter); -#define rtw_read_port (adapter, addr, cnt, mem) \ - _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter))#define rtw_write8_async (adapter, addr, val) \
Signature · 1 line
2.33.0
PATCH v5 10/19 staging: r8188eu: remove the helpers of usb_write_port()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_write_port() and usb_write_port() and embed their code into the caller (i.e., rtw_write_port()).
_rtw_write_port() is a mere redefinition of rtw_write_port() and it is unneeded. usb_write_port() was the only functions assigned to the (*_usb_write_port) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 20 +------------------ drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/rtw_io.h | 4 +--- .../staging/r8188eu/include/usb_ops_linux.h | 1 - .../staging/r8188eu/os_dep/usb_ops_linux.c | 3 +-- 5 files changed, 3 insertions(+), 26 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +1 -19
@@ -87,24 +87,6 @@ void _rtw_read_port_cancel(struct adapter *adapter)_read_port_cancel (pintfhdl); } -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u32 ret = _SUCCESS; - - - - _write_port = pintfhdl->io_ops._write_port; - - ret =_write_port (pintfhdl, addr, cnt, pmem); - - - -return ret; -} -u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms) {int ret = _SUCCESS;
@@ -114,7 +96,7 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmertw_sctx_init (&sctx, timeout_ms); pxmitbuf->sctx = &sctx; - ret =_rtw_write_port (adapter, addr, cnt, pmem); + ret =rtw_write_port (adapter, addr, cnt, pmem);if (ret == _SUCCESS) ret =rtw_sctx_wait (&sctx);
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -1
@@ -562,7 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;
drivers/staging/r8188eu/include/rtw_io.h +1 -3
@@ -262,7 +262,7 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val);void _rtw_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +u32 rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter);
@@ -275,8 +275,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16_async((adapter), (addr), (val))#define rtw_write32_async (adapter, addr, val) \ _rtw_write32_async((adapter), (addr), (val)) -#define rtw_write_port (adapter, addr, cnt, mem) \ - _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \ _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))
drivers/staging/r8188eu/include/usb_ops_linux.h +0 -1
@@ -30,7 +30,6 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);void usb_read_port_cancel (struct intf_hdl *pintfhdl); -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem);void usb_write_port_cancel (struct intf_hdl *pintfhdl);#endif
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +1 -2
@@ -124,14 +124,13 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) } -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem) +u32 rtw_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem) {unsigned long irqL;unsigned int pipe;int status;u32 ret = _FAIL;struct urb *purb =NULL ; -struct adapter *padapter = (struct adapter *)pintfhdl->padapter;struct dvobj_priv *pdvobj =adapter_to_dvobj (padapter);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;
Signature · 1 line
2.33.0
Re: [PATCH v5 10/19] staging: r8188eu: remove the helpers of usb_write_port()
Quoted 118 lines · Fabio M. De Francesco
From: Pavel Skripkin <[email protected]>
Remove the unnecessary
_rtw_write_port()andusb_write_port()and embed their code into the caller (i.e.,rtw_write_port()).
_rtw_write_port()is a mere redefinition ofrtw_write_port()and it is unneeded.usb_write_port()was the only functions assigned to the (*_usb_write_port) pointer, so we can simply remove it and make a direct call.This patch is in preparation for the
_io_opsstructure removal.Co-developed-by Fabio M. De Francesco <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>Signed-off-by Pavel Skripkin <[email protected]>--- drivers/staging/r8188eu/core/rtw_io.c | 20 +------------------ drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/rtw_io.h | 4 +--- .../staging/r8188eu/include/usb_ops_linux.h | 1 - .../staging/r8188eu/os_dep/usb_ops_linux.c | 3 +-- 5 files changed, 3 insertions(+), 26 deletions(-)drivers/staging/r8188eu/core/rtw_io.c +1
-19@@ -87,24 +87,6 @@ void _rtw_read_port_cancel(struct adapter *adapter)_read_port_cancel (pintfhdl); } -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u32 ret = _SUCCESS; - - - - _write_port = pintfhdl->io_ops._write_port; - - ret =_write_port (pintfhdl, addr, cnt, pmem); - - - -return ret; -} -u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms) {int ret = _SUCCESS;@@ -114,7 +96,7 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmertw_sctx_init (&sctx, timeout_ms); pxmitbuf->sctx = &sctx; - ret =_rtw_write_port (adapter, addr, cnt, pmem); + ret =rtw_write_port (adapter, addr, cnt, pmem);if (ret == _SUCCESS) ret =rtw_sctx_wait (&sctx);drivers/staging/r8188eu/hal/usb_ops_linux.c +0
-1@@ -562,7 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;drivers/staging/r8188eu/include/rtw_io.h +1
-3@@ -262,7 +262,7 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val);void _rtw_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +u32 rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter);@@ -275,8 +275,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16_async((adapter), (addr), (val))#define rtw_write32_async (adapter, addr, val) \ _rtw_write32_async((adapter), (addr), (val)) -#define rtw_write_port (adapter, addr, cnt, mem) \ - _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \ _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))drivers/staging/r8188eu/include/usb_ops_linux.h +0
-1@@ -30,7 +30,6 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);void usb_read_port_cancel (struct intf_hdl *pintfhdl); -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem);void usb_write_port_cancel (struct intf_hdl *pintfhdl);#endif drivers/staging/r8188eu/os_dep/usb_ops_linux.c +1
-1@@ -124,14 +124,13 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) } -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem) +u32 rtw_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem)
drivers/staging/r8188eu/os_dep/usb_ops_linux.c static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) · line 136
Quoted 10 lines
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +0
-1{unsigned long irqL;unsigned int pipe;int status;u32 ret = _FAIL;struct urb *purb =NULL ; -struct adapter *padapter = (struct adapter *)pintfhdl->padapter;struct dvobj_priv *pdvobj =adapter_to_dvobj (padapter);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;
Patch 1 failed to apply to Greg's staging-testing branch. Particularly with the changes with large number of patches, you need to remove the commits in question, got a 'git pull', and then test that your changes still apply.
Larry
Re: [PATCH v5 10/19] staging: r8188eu: remove the helpers of usb_write_port()
Quoted 125 lines · Larry Finger
Quoted 124 lines · Fabio M. De Francesco
From: Pavel Skripkin <[email protected]>
Remove the unnecessary
_rtw_write_port()andusb_write_port()and embed their code into the caller (i.e.,rtw_write_port()).
_rtw_write_port()is a mere redefinition ofrtw_write_port()and it is unneeded.usb_write_port()was the only functions assigned to the (*_usb_write_port) pointer, so we can simply remove it and make a direct call.This patch is in preparation for the
_io_opsstructure removal.Co-developed-by Fabio M. De Francesco <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>Signed-off-by Pavel Skripkin <[email protected]>--- drivers/staging/r8188eu/core/rtw_io.c | 20 +------------------ drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/rtw_io.h | 4 +--- .../staging/r8188eu/include/usb_ops_linux.h | 1 - .../staging/r8188eu/os_dep/usb_ops_linux.c | 3 +-- 5 files changed, 3 insertions(+), 26 deletions(-)drivers/staging/r8188eu/core/rtw_io.c +1
-19@@ -87,24 +87,6 @@ void _rtw_read_port_cancel(struct adapter *adapter)_read_port_cancel (pintfhdl); } -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u32 ret = _SUCCESS; - - - - _write_port = pintfhdl->io_ops._write_port; - - ret =_write_port (pintfhdl, addr, cnt, pmem); - - - -return ret; -} -u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms) {int ret = _SUCCESS;@@ -114,7 +96,7 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmertw_sctx_init (&sctx, timeout_ms); pxmitbuf->sctx = &sctx; - ret =_rtw_write_port (adapter, addr, cnt, pmem); + ret =rtw_write_port (adapter, addr, cnt, pmem);if (ret == _SUCCESS) ret =rtw_sctx_wait (&sctx);drivers/staging/r8188eu/hal/usb_ops_linux.c +0
-1@@ -562,7 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;drivers/staging/r8188eu/include/rtw_io.h +1
-3@@ -262,7 +262,7 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val);void _rtw_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +u32 rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter);@@ -275,8 +275,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16_async((adapter), (addr), (val))#define rtw_write32_async (adapter, addr, val) \ _rtw_write32_async((adapter), (addr), (val)) -#define rtw_write_port (adapter, addr, cnt, mem) \ - _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \ _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))drivers/staging/r8188eu/include/usb_ops_linux.h +0
-1@@ -30,7 +30,6 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);void usb_read_port_cancel (struct intf_hdl *pintfhdl); -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem);void usb_write_port_cancel (struct intf_hdl *pintfhdl);#endif drivers/staging/r8188eu/os_dep/usb_ops_linux.c +1
-2@@ -124,14 +124,13 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) } -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem) +u32 rtw_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem) {unsigned long irqL;unsigned int pipe;int status;u32 ret = _FAIL;struct urb *purb =NULL ; -struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
Quoted 9 lines
drivers/staging/r8188eu/os_dep/usb_ops_linux.c static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) · line 136
Quoted 4 lines
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +0
-0struct dvobj_priv *pdvobj =adapter_to_dvobj (padapter);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;Patch 1 failed to apply to Greg's staging-testing branch. Particularly with the changes with large number of patches, you need to remove the commits in question, got a 'git pull', and then test that your changes still apply.
Hi, Larry, thank you for taking a look a the series.
We based our series on top staging-testing. My local working branch has following log:
aadf1e6fd0ca (HEAD -> ops-v5) staging: r8188eu: remove shared buffer for usb requests 4a2945ded9d0 staging: r8188eu: Shorten calls chain of rtw_write8/16/32/N()dc5dd914be8a staging: r8188eu: Shorten calls chain of rtw_read8/16/32()f6510936cbc9 staging: r8188eu: hal: Clean up rtw_read*() and rtw_write*()92fc64725670 staging: r8188eu: hal: Clean up usbctrl_vendorreq()2787e96f1649 staging: remove struct _io_ops9a94c8d23439 staging: r8188eu: remove core/rtw_io.c7bc0a60021a8 staging: r8188eu: remove the helpers of usb_write_port_cancelccc309c8cb36 staging: r8188eu: remove the helpers of usb_read_port_cancelc0633b64266f staging: r8188eu: remove the helpers of usb_write_portc0b56158b2ba staging: r8188eu: remove the helpers of usb_read_port6bbfbaa06af3 staging: r8188eu: remove the helpers of usb_writeNd5339c7287c4 staging: r8188eu: remove the helpers of usb_write328af95fe85c54 staging: r8188eu: remove the helpers of usb_write1603f7642f7975 staging: r8188eu: remove the helpers of usb_write8ce1a4ce58bbd staging: r8188eu: remove the helpers of rtw_read32()5ecd53227cfa staging: r8188eu: remove the helpers of rtw_read16()c36c862fd32e staging: r8188eu: remove the helpers of rtw_read8()01edcf8fcbfe staging: r8188eu: remove usb_{read,write}_mem5e57c668dc09 (origin/staging-testing, staging-testing) staging: wfx: ensure IRQ is ready before enabling it
Can you share your error? Thank you
With regards,
Pavel Skripkin
PATCH v5 11/19 staging: r8188eu: remove the helpers of usb_read_port_cancel()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_read_port_cancel() and usb_read_port_cancel() and embed their code into the caller (i.e., rtw_read_port_cancel()).
_rtw_read_port_cancel() is a mere redefinition of rtw_read_port_cancel() and it is unneeded. usb_read_port_cancel() was the only functions assigned to the (*_usb_read_port_cancel) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 11 ----------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/rtw_io.h | 3 +-- drivers/staging/r8188eu/include/usb_ops_linux.h | 2 -- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 6 ++---- 5 files changed, 3 insertions(+), 20 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -11
@@ -75,17 +75,6 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -void _rtw_read_port_cancel (struct adapter *adapter) -{ -void (*_read_port_cancel)(struct intf_hdl *pintfhdl); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; - - _read_port_cancel = pintfhdl->io_ops._read_port_cancel; - -if (_read_port_cancel) -_read_port_cancel (pintfhdl); -}u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms) {
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -1
@@ -562,7 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel; }
drivers/staging/r8188eu/include/rtw_io.h +1 -2
@@ -250,7 +250,7 @@ u16 rtw_read16(struct adapter *adapter, u32 addr);u32 rtw_read32 (struct adapter *adapter,u32 addr);void _rtw_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void _rtw_read_port_cancel (struct adapter *adapter); +void rtw_read_port_cancel (struct adapter *adapter);int rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int rtw_write16 (struct adapter *adapter,u32 addr,u16 val);
@@ -267,7 +267,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter); -#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter))#define rtw_write8_async (adapter, addr, val) \ _rtw_write8_async((adapter), (addr), (val))
drivers/staging/r8188eu/include/usb_ops_linux.h +0 -2
@@ -28,8 +28,6 @@unsigned int ffaddr2pipehdl (struct dvobj_priv *pdvobj,u32 addr); -void usb_read_port_cancel (struct intf_hdl *pintfhdl); -void usb_write_port_cancel (struct intf_hdl *pintfhdl);#endif
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +2 -4
@@ -31,12 +31,10 @@ struct zero_bulkout_context {void *padapter; }; -void usb_read_port_cancel (struct intf_hdl *pintfhdl) +void rtw_read_port_cancel (struct adapter *padapter) {int i; -struct recv_buf *precvbuf; -struct adapter *padapter = pintfhdl->padapter; - precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; +struct recv_buf *precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;DBG_88E ("%s\n" , __func__);
Signature · 1 line
2.33.0
PATCH v5 12/19 staging: r8188eu: remove the helpers of usb_write_port_cancel()
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Remove the unnecessary _rtw_write_port_cancel() and usb_write_port_cancel() and embed their code into the caller (i.e., rtw_write_port_cancel()).
_rtw_write_port_cancel() is a mere redefinition of rtw_write_port_cancel() and it is unneeded. usb_write_port_cancel() was the only functions assigned to the (*_usb_write_port_cancel) pointer, so we can simply remove it and make a direct call.
This patch is in preparation for the _io_ops structure removal.
--- drivers/staging/r8188eu/core/rtw_io.c | 12 ------------ drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 -- drivers/staging/r8188eu/include/rtw_io.h | 3 +-- drivers/staging/r8188eu/include/usb_ops_linux.h | 2 -- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 3 +-- 5 files changed, 2 insertions(+), 20 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +0 -12
@@ -93,18 +93,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmereturn ret; } -void _rtw_write_port_cancel (struct adapter *adapter) -{ -void (*_write_port_cancel)(struct intf_hdl *pintfhdl); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; - - _write_port_cancel = pintfhdl->io_ops._write_port_cancel; - -if (_write_port_cancel) -_write_port_cancel (pintfhdl); -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -2
@@ -562,8 +562,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_write_port_cancel = &usb_write_port_cancel; - }void rtl8188eu_set_hw_type (struct adapter *adapt)
drivers/staging/r8188eu/include/rtw_io.h +1 -2
@@ -265,7 +265,7 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);u32 rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms); -void _rtw_write_port_cancel (struct adapter *adapter); +void rtw_write_port_cancel (struct adapter *adapter);#define rtw_write8_async (adapter, addr, val) \
@@ -276,7 +276,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write32_async((adapter), (addr), (val))#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \ _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms)) -#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))/* ioreq */ void ioreq_read8 (struct adapter *adapter,u32 addr,u8 *pval);
drivers/staging/r8188eu/include/usb_ops_linux.h +0 -2
@@ -28,6 +28,4 @@unsigned int ffaddr2pipehdl (struct dvobj_priv *pdvobj,u32 addr); -void usb_write_port_cancel (struct intf_hdl *pintfhdl); -#endif
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +1 -2
@@ -211,10 +211,9 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem)return ret; } -void usb_write_port_cancel (struct intf_hdl *pintfhdl) +void rtw_write_port_cancel (struct adapter *padapter) {int i, j; -struct adapter *padapter = pintfhdl->padapter;struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;DBG_88E ("%s\n" , __func__);
Signature · 1 line
2.33.0
PATCH v5 13/19 staging: r8188eu: remove core/rtw_io.c
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
There are only unused functions and macros and one function which can be open-coded.
So, removed core/rtw_io.c at all, removed core/rtw_io.c from Makefile and open-coded rtw_init_io_priv
--- drivers/staging/r8188eu/Makefile | 1 - drivers/staging/r8188eu/core/rtw_io.c | 111 ---------------------- drivers/staging/r8188eu/include/rtw_io.h | 19 +--- drivers/staging/r8188eu/os_dep/usb_intf.c | 8 +- 4 files changed, 8 insertions(+), 131 deletions(-) delete mode 100644 drivers/staging/r8188eu/core/rtw_io.c
drivers/staging/r8188eu/Makefile +0 -1
@@ -78,7 +78,6 @@ rtk_core := \ core/rtw_debug.o \ core/rtw_efuse.o \ core/rtw_ieee80211.o \ - core/rtw_io.o \ core/rtw_ioctl_set.o \ core/rtw_iol.o \ core/rtw_led.o \
drivers/staging/r8188eu/core/rtw_io.c deleted +0 -111
111 lines not on this page · raw message
drivers/staging/r8188eu/include/rtw_io.h +1 -18
@@ -257,25 +257,11 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val);int rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); -int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val); -int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val); -int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val); -void _rtw_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt, -u8 *pmem,int timeout_ms);void rtw_write_port_cancel (struct adapter *adapter); - -#define rtw_write8_async (adapter, addr, val) \ - _rtw_write8_async((adapter), (addr), (val)) -#define rtw_write16_async (adapter, addr, val) \ - _rtw_write16_async((adapter), (addr), (val)) -#define rtw_write32_async (adapter, addr, val) \ - _rtw_write32_async((adapter), (addr), (val)) -#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \ - _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms)) +void rtw_write_scsi (struct adapter *adapter,u32 cnt,u8 *pmem);/* ioreq */ void ioreq_read8 (struct adapter *adapter,u32 addr,u8 *pval);
@@ -317,9 +303,6 @@ void async_write32(struct adapter *adapter, u32 addr, u32 val,void async_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void async_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -int rtw_init_io_priv (struct adapter *padapter, -void (*set_intf_ops)(struct _io_ops *pops)); -uint alloc_io_queue (struct adapter *adapter);void free_io_queue (struct adapter *adapter);void async_bus_io (struct io_queue *pio_q);
drivers/staging/r8188eu/os_dep/usb_intf.c +7 -1
@@ -448,6 +448,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,struct adapter *padapter =NULL ;struct net_device *pnetdev =NULL ;int status = _FAIL; +struct io_priv *piopriv; +struct intf_hdl *pintf; padapter =vzalloc (sizeof (*padapter));if (!padapter)
@@ -479,7 +481,11 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, padapter->intf_stop = &usb_intf_stop;/* step init_io_priv */ -rtw_init_io_priv (padapter, usb_set_intf_ops); + piopriv = &padapter->iopriv; + pintf = &piopriv->intf; + piopriv->padapter = padapter; + pintf->padapter = padapter; + pintf->pintf_dev =adapter_to_dvobj (padapter);/* step read_chip_version */ rtl8188e_read_chip_version (padapter);
Signature · 1 line
2.33.0
PATCH v5 14/19 staging: remove struct _io_ops
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
Finally struct _io_ops is unused, so remove it.
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 6 ----- drivers/staging/r8188eu/include/rtw_io.h | 25 --------------------- drivers/staging/r8188eu/include/usb_ops.h | 2 -- 3 files changed, 33 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -6
@@ -558,12 +558,6 @@ void rtl8188eu_xmit_tasklet(unsigned long priv) } } -void rtl8188eu_set_intf_ops (struct _io_ops *pops) -{ - -memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); -} -void rtl8188eu_set_hw_type (struct adapter *adapt) { adapt->chip_type =RTL8188E ;
drivers/staging/r8188eu/include/rtw_io.h +0 -25
@@ -84,30 +84,6 @@ struct intf_priv;struct intf_hdl ;struct io_queue ; -struct _io_ops { -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); -u16 (*_read16)(struct intf_hdl *pintfhdl,u32 addr); -u32 (*_read32)(struct intf_hdl *pintfhdl,u32 addr); -int (*_write8)(struct intf_hdl *pintfhdl,u32 addr,u8 val); -int (*_write16)(struct intf_hdl *pintfhdl,u32 addr,u16 val); -int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val); -int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length, -u8 *pdata); -int (*_write8_async)(struct intf_hdl *pintfhdl,u32 addr,u8 val); -int (*_write16_async)(struct intf_hdl *pintfhdl,u32 addr,u16 val); -int (*_write32_async)(struct intf_hdl *pintfhdl,u32 addr,u32 val); -void (*_read_mem)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt, -u8 *pmem); -void (*_write_mem)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt, -u8 *pmem); -u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt, -u8 *pmem); -u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt, -u8 *pmem); -void (*_read_port_cancel)(struct intf_hdl *pintfhdl); -void (*_write_port_cancel)(struct intf_hdl *pintfhdl); -}; -struct io_req {struct list_head list;u32 addr;
@@ -125,7 +101,6 @@ struct io_req {struct intf_hdl {struct adapter *padapter;struct dvobj_priv *pintf_dev; -struct _io_ops io_ops; };struct reg_protocol_rd {
drivers/staging/r8188eu/include/usb_ops.h +0 -2
@@ -21,8 +21,6 @@void rtl8188eu_set_hw_type (struct adapter *padapter);#define hal_set_hw_type rtl8188eu_set_hw_type -void rtl8188eu_set_intf_ops (struct _io_ops *pops); -#define usb_set_intf_ops rtl8188eu_set_intf_ops/* * Increase and check if the continual_urb_error of this @param dvobjprivei
Signature · 1 line
2.33.0
PATCH v5 15/19 staging: r8188eu: hal: Clean up usbctrl_vendorreq()
In reply to Fabio M. De FrancescoClean up usbctrl_vendoreq () in usb_ops_linux.c. Eventually this function will be deleted but some of the code will be reused later. This cleanup makes code reuse easier.
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 60 +++++++++------------ 1 file changed, 26 insertions(+), 34 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +26 -34
@@ -8,15 +8,15 @@#include "../include/recv_osdep.h" #include "../include/rtl8188e_hal.h" -static int usbctrl_vendorreq (struct intf_hdl *pintfhdl,u16 value,void *pdata,u16 len,u8 requesttype) +static int usbctrl_vendorreq (struct intf_hdl *intfhdl,u16 value,void *data,u16 len,u8 requesttype) { -struct adapter *adapt = pintfhdl->padapter; -struct dvobj_priv *dvobjpriv =adapter_to_dvobj (adapt); +struct adapter *adapt = intfhdl->padapter; +struct dvobj_priv *dvobjpriv =adapter_to_dvobj (adapt);struct usb_device *udev = dvobjpriv->pusbdev; +int vendorreq_times =0 ;unsigned int pipe;int status =0 ; -u8 *pIo_buf; -int vendorreq_times =0 ; +u8 *io_buf;if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) { status = -EPERM ;
@@ -32,51 +32,44 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,mutex_lock (&dvobjpriv->usb_vendor_req_mutex);/* Acquire IO memory for vendorreq */ - pIo_buf = dvobjpriv->usb_vendor_req_buf; - -if (!pIo_buf) { -DBG_88E ("[%s] pIo_buf == NULL\n" , __func__); - status = -ENOMEM ; - goto release_mutex; - } + io_buf = dvobjpriv->usb_vendor_req_buf;if (requesttype ==REALTEK_USB_VENQT_READ ) - pipe =usb_rcvctrlpipe (udev,0 );/* read_in */ +/* read in */ + pipe =usb_rcvctrlpipe (udev,0 );else - pipe =usb_sndctrlpipe (udev,0 );/* write_out */ +/* write out */ + pipe =usb_sndctrlpipe (udev,0 );while (++vendorreq_times <=MAX_USBCTRL_VENDORREQ_TIMES ) {if (requesttype ==REALTEK_USB_VENQT_READ ) -memset (pIo_buf,0 , len); +memset (io_buf,0 , len);else -memcpy (pIo_buf, pdata, len); +memcpy (io_buf, data, len); status =usb_control_msg (udev, pipe,REALTEK_USB_VENQT_CMD_REQ , requesttype, value,REALTEK_USB_VENQT_CMD_IDX , - pIo_buf, len,RTW_USB_CONTROL_MSG_TIMEOUT ); + io_buf, len,RTW_USB_CONTROL_MSG_TIMEOUT ); -if (status == len) {/* Success this control transfer. */ +if (status == len) { +/* success */ rtw_reset_continual_urb_error (dvobjpriv);if (requesttype ==REALTEK_USB_VENQT_READ ) -memcpy (pdata, pIo_buf, len); - }else {/* error cases */ -DBG_88E ("reg 0x%x, usb %s %u fail, status:%d value=0x%x, vendorreq_times:%d\n" , - value, (requesttype ==REALTEK_USB_VENQT_READ ) ?"read" :"write" , - len, status, *(u32 *)pdata, vendorreq_times); - +memcpy (data, io_buf, len); + }else { +/* errors */ if (status <0 ) { -if (status == (-ESHUTDOWN ) || status == -ENODEV ) { +if (status == (-ESHUTDOWN || -ENODEV )) { adapt->bSurpriseRemoved = true; }else { -struct hal_data_8188e *haldata =GET_HAL_DATA (adapt); +struct hal_data_8188e *haldata =GET_HAL_DATA (adapt); haldata->srestpriv.wifi_error_status =USB_VEN_REQ_CMD_FAIL ; } - }else {/* status != len && status >= 0 */ + }else { +/* status != len && status >= 0 */ if (status >0 ) { -if (requesttype ==REALTEK_USB_VENQT_READ ) { -/* For Control read transfer, we have to copy the read data from pIo_buf to pdata. */ -memcpy (pdata, pIo_buf, len); - } +if (requesttype ==REALTEK_USB_VENQT_READ ) +memcpy (data, io_buf, len); } }
@@ -86,12 +79,11 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, } } - -/* firmware download is checksumed, don't retry */ +/* firmware download is checksummed, don't retry */ if ((value >=FW_8188E_START_ADDRESS && value <=FW_8188E_END_ADDRESS ) || status == len)break ; } -release_mutex: +mutex_unlock (&dvobjpriv->usb_vendor_req_mutex); exit:return status;
Signature · 1 line
2.33.0
Re: [PATCH v5 15/19] staging: r8188eu: hal: Clean up usbctrl_vendorreq()
Quoted 4 lines · Fabio M. De Francesco
Clean up
usbctrl_vendoreq() inusb_ops_linux.c. Eventually this function will be deleted but some of the code will be reused later. This cleanup makes code reuse easier.
Thanks for removing the URL. This commit message is no longer bad to the point where it has to be redone but it's still not great.
I explicitly told you to leave the irrelevant information out. I'm trying to help you and it's frustrating that you're not listening. I wish that you had just copy and pasted the commit message which I sent.
This relates the discussion we had about reviewing patches one at a time in the order they arrive. Every patch should be self contained. It should not refer to the past except in the case of explaining the Fixes tag and it should not refer to the future except in the case where it needs to excuse adding unused infrastructure. Reviewing is stateless. We don't want to know about your plans.
On the other hand, the commit message doesn't list the changes the commit makes as part of the clean up process. That would have been helpful information for me as a reviewer.
*Sigh* Whatever... I would have allowed this commit message but there is a bug in the code.
drivers/staging/r8188eu/hal/usb_ops_linux.c static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, · line 62
Quoted 6 lines
drivers/staging/r8188eu/hal/usb_ops_linux.c +4
-1+memcpy (data, io_buf, len); + }else { +/* errors */ if (status <0 ) { -if (status == (-ESHUTDOWN ) || status == -ENODEV ) { +if (status == (-ESHUTDOWN || -ENODEV )) {
This is a bug so you'll have to redo the patch.
regards,
dan carpenter
Re: [PATCH v5 15/19] staging: r8188eu: hal: Clean up usbctrl_vendorreq()
Quoted 11 lines · CEST Dan Carpenter
Quoted 4 lines · Fabio M. De Francesco
Clean up
usbctrl_vendoreq() inusb_ops_linux.c. Eventually this function will be deleted but some of the code will be reused later. This cleanup makes code reuse easier.Thanks for removing the URL. This commit message is no longer bad to the point where it has to be redone but it's still not great.
I explicitly told you to leave the irrelevant information out. I'm trying to help you and it's frustrating that you're not listening. I wish that you had just copy and pasted the commit message which I sent.
I'm sorry, seriously. It's hard to listen carefully when I need to do my *real* work while trying my best to contribute to the kernel. Sometimes I'm so tired that I forget something important or what it is said by reviewers. I know that this is not a good excuse, anyway please don't ever think that I don't mind of the time you spend on reviews and writing suggestions.
Quoted 11 lines
This relates the discussion we had about reviewing patches one at a time in the order they arrive. Every patch should be self contained. It should not refer to the past except in the case of explaining the Fixes tag and it should not refer to the future except in the case where it needs to excuse adding unused infrastructure. Reviewing is stateless. We don't want to know about your plans.
On the other hand, the commit message doesn't list the changes the commit makes as part of the clean up process. That would have been helpful information for me as a reviewer.
Quoted 8 lines
*Sigh* Whatever... I would have allowed this commit message but there is a bug in the code.
drivers/staging/r8188eu/hal/usb_ops_linux.c static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
Quoted 5 lines
drivers/staging/r8188eu/hal/usb_ops_linux.c +3
-1+memcpy (data, io_buf, len); + }else { +/* errors */ if (status <0 ) { - if (status == (-ESHUTDOWN) ||
status == -ENODEV) {
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ if (status == (-ESHUTDOWN || -
ENODEV)) {
Quoted 2 lines
This is a bug so you'll have to redo the patch.
This is the proof of what I was trying to convey with the words above. I perfectly knew, since days, that this line is wrong but for some reason that I really cannot understand why it's still there.
Thank you very much,
Fabio
Quoted 3 lines
regards,
dan carpenter
PATCH v5 16/19 staging: r8188eu: hal: Clean up rtw_read*() and rtw_write*()
In reply to Fabio M. De FrancescoClean up rtw_read{8,16,32}() and rtw_write{8,16,32,N}() in usb_ops_linux.c.
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 68 ++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +34 -34
@@ -91,91 +91,91 @@ static int usbctrl_vendorreq(struct intf_hdl *intfhdl, u16 value, void *data, u1u8 rtw_read8 (struct adapter *adapter,u32 addr) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf; +u16 address = addr &0xffff ;u8 data; - -usbctrl_vendorreq (pintfhdl, wvalue, &data,1 ,REALTEK_USB_VENQT_READ ); +usbctrl_vendorreq (intfhdl, address, &data,1 ,REALTEK_USB_VENQT_READ );return data; }u16 rtw_read16 (struct adapter *adapter,u32 addr) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); -__le32 data; +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf; +u16 address = addr &0xffff ; +__le16 data; -usbctrl_vendorreq (pintfhdl, wvalue, &data,2 ,REALTEK_USB_VENQT_READ ); +usbctrl_vendorreq (intfhdl, address, &data,2 ,REALTEK_USB_VENQT_READ ); -return (u16)(le32_to_cpu (data) &0xffff ); +return le16_to_cpu (data); }u32 rtw_read32 (struct adapter *adapter,u32 addr) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf; +u16 address = addr &0xffff ;__le32 data; -usbctrl_vendorreq (pintfhdl, wvalue, &data,4 ,REALTEK_USB_VENQT_READ ); +usbctrl_vendorreq (intfhdl, address, &data,4 ,REALTEK_USB_VENQT_READ );return le32_to_cpu (data); }int rtw_write8 (struct adapter *adapter,u32 addr,u8 val) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf; +u16 address = addr &0xffff ;int ret; - ret =usbctrl_vendorreq (pintfhdl, wvalue, &val,1 ,REALTEK_USB_VENQT_WRITE ); + ret =usbctrl_vendorreq (intfhdl, address, &val,1 ,REALTEK_USB_VENQT_WRITE );return RTW_STATUS_CODE (ret); }int rtw_write16 (struct adapter *adapter,u32 addr,u16 val) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); -__le32 data =cpu_to_le32 (val &0x0000ffff ); +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf; +__le16 data =cpu_to_le16 (val); +u16 address = addr &0xffff ;int ret; - ret =usbctrl_vendorreq (pintfhdl, wvalue, &data,2 ,REALTEK_USB_VENQT_WRITE ); + ret =usbctrl_vendorreq (intfhdl, address, &data,2 ,REALTEK_USB_VENQT_WRITE );return RTW_STATUS_CODE (ret); }int rtw_write32 (struct adapter *adapter,u32 addr,u32 val) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf;__le32 data =cpu_to_le32 (val); +u16 address = addr &0xffff ;int ret; - ret =usbctrl_vendorreq (pintfhdl, wvalue, &data,4 ,REALTEK_USB_VENQT_WRITE ); + ret =usbctrl_vendorreq (intfhdl, address, &data,4 ,REALTEK_USB_VENQT_WRITE );return RTW_STATUS_CODE (ret); } -int rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) +int rtw_writeN (struct adapter *adapter,u32 addr,u32 len,u8 *data) { -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &pio_priv->intf; -u16 wvalue = (u16)(addr &0x0000ffff ); +struct io_priv *io_priv = &adapter->iopriv; +struct intf_hdl *intfhdl = &io_priv->intf;u8 buf[VENDOR_CMD_MAX_DATA_LEN ] = {0 }; +u16 address = addr &0xffff ; +u16 length = len &0xffff ;int ret;if (length >VENDOR_CMD_MAX_DATA_LEN )return _FAIL; -memcpy (buf, pdata, length); - ret =usbctrl_vendorreq (pintfhdl, wvalue, buf, (length &0xffff ),REALTEK_USB_VENQT_WRITE ); +memcpy (buf, data, length); + ret =usbctrl_vendorreq (intfhdl, address, buf, length,REALTEK_USB_VENQT_WRITE );return RTW_STATUS_CODE (ret); }
Signature · 1 line
2.33.0
PATCH v5 17/19 staging: r8188eu: Shorten calls chain of rtw_read8/16/32()
In reply to Fabio M. De FrancescoShorten the calls chain of rtw_read8/16/32() down to the actual reads. For this purpose unify the three usb_read8/16/32 into the new usb_read(); make the latter parameterizable with 'size'; embed most of the code of usbctrl_vendorreq() into usb_read() and use in it the new usb_control_msg_recv() API of USB Core.
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 60 +++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +57 -3
@@ -89,13 +89,67 @@ static int usbctrl_vendorreq(struct intf_hdl *intfhdl, u16 value, void *data, u1return status; } +static int usb_read (struct intf_hdl *intfhdl,u16 addr,void *data,u8 size) +{ +struct adapter *adapt = intfhdl->padapter; +struct dvobj_priv *dvobjpriv =adapter_to_dvobj (adapt); +struct usb_device *udev = dvobjpriv->pusbdev; +int status; +u8 *io_buf;/* Pointer to I/O buffer */ + +if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) +return -EPERM ; + +mutex_lock (&dvobjpriv->usb_vendor_req_mutex); + + io_buf = dvobjpriv->usb_vendor_req_buf; + + status =usb_control_msg_recv (udev,0 ,REALTEK_USB_VENQT_CMD_REQ , +REALTEK_USB_VENQT_READ , addr, +REALTEK_USB_VENQT_CMD_IDX , io_buf, + size,RTW_USB_CONTROL_MSG_TIMEOUT , +GFP_KERNEL ); + +if (status == -ESHUTDOWN || + status == -ENODEV || + status == -ENOENT ) { +/* +* device or controller has been disabled due to +* some problem that could not be worked around, +* device or bus doesn’t exist, endpoint does not +* exist or is not enabled. +*/ + adapt->bSurpriseRemoved = true; + goto mutex_unlock; + } + +if (status <0 ) { +GET_HAL_DATA (adapt)->srestpriv.wifi_error_status = +USB_VEN_REQ_CMD_FAIL ; + +if (rtw_inc_and_chk_continual_urb_error (dvobjpriv)) + adapt->bSurpriseRemoved = true; + + goto mutex_unlock; + } + +rtw_reset_continual_urb_error (dvobjpriv); +memcpy (data, io_buf, size); + +mutex_unlock: +mutex_unlock (&dvobjpriv->usb_vendor_req_mutex); + +return status; +} +u8 rtw_read8 (struct adapter *adapter,u32 addr) {struct io_priv *io_priv = &adapter->iopriv;struct intf_hdl *intfhdl = &io_priv->intf;u16 address = addr &0xffff ;u8 data; -usbctrl_vendorreq (intfhdl, address, &data,1 ,REALTEK_USB_VENQT_READ ); + +usb_read (intfhdl, address, &data,1 );return data; }
@@ -107,7 +161,7 @@ u16 rtw_read16(struct adapter *adapter, u32 addr)u16 address = addr &0xffff ;__le16 data; -usbctrl_vendorreq (intfhdl, address, &data,2 ,REALTEK_USB_VENQT_READ ); +usb_read (intfhdl, address, &data,2 );return le16_to_cpu (data); }
@@ -119,7 +173,7 @@ u32 rtw_read32(struct adapter *adapter, u32 addr)u16 address = addr &0xffff ;__le32 data; -usbctrl_vendorreq (intfhdl, address, &data,4 ,REALTEK_USB_VENQT_READ ); +usb_read (intfhdl, address, &data,4 );return le32_to_cpu (data); }
Signature · 1 line
2.33.0
PATCH v5 18/19 staging: r8188eu: Shorten calls chain of rtw_write8/16/32/N()
In reply to Fabio M. De FrancescoShorten the calls chain of rtw_write8/16/32() down to the actual writes. For this purpose unify the four usb_write8/16/32/N() into the new usb_write(); make the latter parameterizable with 'size'; embed most of the code of usbctrl_vendorreq() into usb_write() and use in it the new usb_control_msg_send() API of USB Core.
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 112 +++++++------------- 1 file changed, 41 insertions(+), 71 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +41 -71
@@ -8,88 +8,60 @@#include "../include/recv_osdep.h" #include "../include/rtl8188e_hal.h" -static int usbctrl_vendorreq (struct intf_hdl *intfhdl,u16 value,void *data,u16 len,u8 requesttype) +static int usb_read (struct intf_hdl *intfhdl,u16 addr,void *data,u8 size) {struct adapter *adapt = intfhdl->padapter;struct dvobj_priv *dvobjpriv =adapter_to_dvobj (adapt);struct usb_device *udev = dvobjpriv->pusbdev; -int vendorreq_times =0 ; -unsigned int pipe; -int status =0 ; -u8 *io_buf; - -if ((adapt->bSurpriseRemoved) || (adapt->pwrctrlpriv.pnp_bstop_trx)) { - status = -EPERM ; - goto exit; - } +int status; +u8 *io_buf;/* Pointer to I/O buffer */ -if (len >MAX_VENDOR_REQ_CMD_SIZE ) { -DBG_88E ("[%s] Buffer len error ,vendor request failed\n" , __func__); - status = -EINVAL ; - goto exit; - } +if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) +return -EPERM ;mutex_lock (&dvobjpriv->usb_vendor_req_mutex); -/* Acquire IO memory for vendorreq */ io_buf = dvobjpriv->usb_vendor_req_buf; -if (requesttype ==REALTEK_USB_VENQT_READ ) -/* read in */ - pipe =usb_rcvctrlpipe (udev,0 ); -else -/* write out */ - pipe =usb_sndctrlpipe (udev,0 ); - -while (++vendorreq_times <=MAX_USBCTRL_VENDORREQ_TIMES ) { -if (requesttype ==REALTEK_USB_VENQT_READ ) -memset (io_buf,0 , len); -else -memcpy (io_buf, data, len); + status =usb_control_msg_recv (udev,0 ,REALTEK_USB_VENQT_CMD_REQ , +REALTEK_USB_VENQT_READ , addr, +REALTEK_USB_VENQT_CMD_IDX , io_buf, + size,RTW_USB_CONTROL_MSG_TIMEOUT , +GFP_KERNEL ); - status =usb_control_msg (udev, pipe,REALTEK_USB_VENQT_CMD_REQ , - requesttype, value,REALTEK_USB_VENQT_CMD_IDX , - io_buf, len,RTW_USB_CONTROL_MSG_TIMEOUT ); +if (status == -ESHUTDOWN || + status == -ENODEV || + status == -ENOENT ) { +/* +* device or controller has been disabled due to +* some problem that could not be worked around, +* device or bus doesn’t exist, endpoint does not +* exist or is not enabled. +*/ + adapt->bSurpriseRemoved = true; + goto mutex_unlock; + } -if (status == len) { -/* success */ -rtw_reset_continual_urb_error (dvobjpriv); -if (requesttype ==REALTEK_USB_VENQT_READ ) -memcpy (data, io_buf, len); - }else { -/* errors */ -if (status <0 ) { -if (status == (-ESHUTDOWN || -ENODEV )) { - adapt->bSurpriseRemoved = true; - }else { -struct hal_data_8188e *haldata =GET_HAL_DATA (adapt); - haldata->srestpriv.wifi_error_status =USB_VEN_REQ_CMD_FAIL ; - } - }else { -/* status != len && status >= 0 */ -if (status >0 ) { -if (requesttype ==REALTEK_USB_VENQT_READ ) -memcpy (data, io_buf, len); - } - } +if (status <0 ) { +GET_HAL_DATA (adapt)->srestpriv.wifi_error_status = +USB_VEN_REQ_CMD_FAIL ; -if (rtw_inc_and_chk_continual_urb_error (dvobjpriv)) { - adapt->bSurpriseRemoved = true; -break ; - } +if (rtw_inc_and_chk_continual_urb_error (dvobjpriv)) + adapt->bSurpriseRemoved = true; - } -/* firmware download is checksummed, don't retry */ -if ((value >=FW_8188E_START_ADDRESS && value <=FW_8188E_END_ADDRESS ) || status == len) -break ; + goto mutex_unlock; } +rtw_reset_continual_urb_error (dvobjpriv); +memcpy (data, io_buf, size); + +mutex_unlock:mutex_unlock (&dvobjpriv->usb_vendor_req_mutex); -exit: +return status; } -static int usb_read (struct intf_hdl *intfhdl,u16 addr,void *data,u8 size) +static int usb_write (struct intf_hdl *intfhdl,u16 addr,void *data,u8 size) {struct adapter *adapt = intfhdl->padapter;struct dvobj_priv *dvobjpriv =adapter_to_dvobj (adapt);
@@ -103,9 +75,10 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)mutex_lock (&dvobjpriv->usb_vendor_req_mutex); io_buf = dvobjpriv->usb_vendor_req_buf; +memcpy (io_buf, data, size); - status =usb_control_msg_recv (udev,0 ,REALTEK_USB_VENQT_CMD_REQ , -REALTEK_USB_VENQT_READ , addr, + status =usb_control_msg_send (udev,0 ,REALTEK_USB_VENQT_CMD_REQ , +REALTEK_USB_VENQT_WRITE , addr,REALTEK_USB_VENQT_CMD_IDX , io_buf, size,RTW_USB_CONTROL_MSG_TIMEOUT ,GFP_KERNEL );
@@ -134,7 +107,6 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size) }rtw_reset_continual_urb_error (dvobjpriv); -memcpy (data, io_buf, size); mutex_unlock:mutex_unlock (&dvobjpriv->usb_vendor_req_mutex);
@@ -185,7 +157,7 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val)u16 address = addr &0xffff ;int ret; - ret =usbctrl_vendorreq (intfhdl, address, &val,1 ,REALTEK_USB_VENQT_WRITE ); + ret =usb_write (intfhdl, address, &val,1 );return RTW_STATUS_CODE (ret); }
@@ -198,7 +170,7 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val)u16 address = addr &0xffff ;int ret; - ret =usbctrl_vendorreq (intfhdl, address, &data,2 ,REALTEK_USB_VENQT_WRITE ); + ret =usb_write (intfhdl, address, &data,2 );return RTW_STATUS_CODE (ret); }
@@ -211,7 +183,7 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val)u16 address = addr &0xffff ;int ret; - ret =usbctrl_vendorreq (intfhdl, address, &data,4 ,REALTEK_USB_VENQT_WRITE ); + ret =usb_write (intfhdl, address, &data,4 );return RTW_STATUS_CODE (ret); }
@@ -220,7 +192,6 @@ int rtw_writeN(struct adapter *adapter, u32 addr, u32 len, u8 *data) {struct io_priv *io_priv = &adapter->iopriv;struct intf_hdl *intfhdl = &io_priv->intf; -u8 buf[VENDOR_CMD_MAX_DATA_LEN ] = {0 };u16 address = addr &0xffff ;u16 length = len &0xffff ;int ret;
@@ -228,8 +199,7 @@ int rtw_writeN(struct adapter *adapter, u32 addr, u32 len, u8 *data)if (length >VENDOR_CMD_MAX_DATA_LEN )return _FAIL; -memcpy (buf, data, length); - ret =usbctrl_vendorreq (intfhdl, address, buf, length,REALTEK_USB_VENQT_WRITE ); + ret =usb_write (intfhdl, address, data, length);return RTW_STATUS_CODE (ret); }
Signature · 1 line
2.33.0
PATCH v5 19/19 staging: r8188eu: remove shared buffer for usb requests
In reply to Fabio M. De FrancescoFrom: Pavel Skripkin <[email protected]>
This driver used shared buffer for usb requests. It led to using mutexes, i.e no usb requests can be done in parallel.
USB requests can be fired in parallel since USB Core allows it. In order to allow them, remove usb_vendor_req_buf from dvobj_priv (since USB I/O is the only user of it) and remove also usb_vendor_req_mutex (since there is nothing to protect).
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 29 ++++++++++----------- drivers/staging/r8188eu/include/drv_types.h | 5 ---- drivers/staging/r8188eu/os_dep/usb_intf.c | 29 +-------------------- 3 files changed, 15 insertions(+), 48 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +14 -15
@@ -19,9 +19,9 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx)return -EPERM ; -mutex_lock (&dvobjpriv->usb_vendor_req_mutex); - - io_buf = dvobjpriv->usb_vendor_req_buf; + io_buf =kmalloc (size,GFP_KERNEL ); +if (!io_buf) +return -ENOMEM ; status = usb_control_msg_recv(udev, 0, REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ, addr,
@@ -39,7 +39,7 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)* exist or is not enabled. */ adapt->bSurpriseRemoved = true; - goto mutex_unlock; + goto end; }if (status <0 ) {
@@ -49,15 +49,14 @@ static int usb_read(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)if (rtw_inc_and_chk_continual_urb_error (dvobjpriv)) adapt->bSurpriseRemoved = true; - goto mutex_unlock; + goto end; }rtw_reset_continual_urb_error (dvobjpriv);memcpy (data, io_buf, size); -mutex_unlock: -mutex_unlock (&dvobjpriv->usb_vendor_req_mutex); - +end: +kfree (io_buf);return status; }
@@ -72,9 +71,10 @@ static int usb_write(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx)return -EPERM ; -mutex_lock (&dvobjpriv->usb_vendor_req_mutex); + io_buf =kmalloc (size,GFP_KERNEL ); +if (!io_buf) +return -ENOMEM ; - io_buf = dvobjpriv->usb_vendor_req_buf;memcpy (io_buf, data, size); status = usb_control_msg_send(udev, 0, REALTEK_USB_VENQT_CMD_REQ,
@@ -93,7 +93,7 @@ static int usb_write(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)* exist or is not enabled. */ adapt->bSurpriseRemoved = true; - goto mutex_unlock; + goto end; }if (status <0 ) {
@@ -103,14 +103,13 @@ static int usb_write(struct intf_hdl *intfhdl, u16 addr, void *data, u8 size)if (rtw_inc_and_chk_continual_urb_error (dvobjpriv)) adapt->bSurpriseRemoved = true; - goto mutex_unlock; + goto end; }rtw_reset_continual_urb_error (dvobjpriv); -mutex_unlock: -mutex_unlock (&dvobjpriv->usb_vendor_req_mutex); - +end: +kfree (io_buf);return status; }
drivers/staging/r8188eu/include/drv_types.h +0 -5
@@ -168,11 +168,6 @@ struct dvobj_priv {int ep_num[5 ];/* endpoint number */ int RegUsbSS;struct semaphore usb_suspend_sema; -struct mutex usb_vendor_req_mutex; - -u8 *usb_alloc_vendor_req_buf; -u8 *usb_vendor_req_buf; -struct usb_interface *pusbintf;struct usb_device *pusbdev;
drivers/staging/r8188eu/os_dep/usb_intf.c +1 -28
@@ -73,29 +73,6 @@ static struct rtw_usb_drv rtl8188e_usb_drv = {static struct rtw_usb_drv *usb_drv = &rtl8188e_usb_drv; -static u8 rtw_init_intf_priv (struct dvobj_priv *dvobj) -{ -u8 rst = _SUCCESS; - -mutex_init (&dvobj->usb_vendor_req_mutex); - - dvobj->usb_alloc_vendor_req_buf =kzalloc (MAX_USB_IO_CTL_SIZE ,GFP_KERNEL ); -if (!dvobj->usb_alloc_vendor_req_buf) { -DBG_88E ("alloc usb_vendor_req_buf failed... /n" ); - rst = _FAIL; - goto exit; - } - dvobj->usb_vendor_req_buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(dvobj->usb_alloc_vendor_req_buf),ALIGNMENT_UNIT ); -exit: -return rst; -} - -static void rtw_deinit_intf_priv (struct dvobj_priv *dvobj) -{ -kfree (dvobj->usb_alloc_vendor_req_buf); -mutex_destroy (&dvobj->usb_vendor_req_mutex); -} -static struct dvobj_priv *usb_dvobj_init (struct usb_interface *usb_intf) {int i;
@@ -158,9 +135,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)DBG_88E ("NON USB_SPEED_HIGH\n" ); } -if (rtw_init_intf_priv (pdvobjpriv) == _FAIL) - goto free_dvobj; -/* 3 misc */ sema_init (&pdvobjpriv->usb_suspend_sema,0 );rtw_reset_continual_urb_error (pdvobjpriv);
@@ -169,7 +143,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) status = _SUCCESS; -free_dvobj:if (status != _SUCCESS && pdvobjpriv) {usb_set_intfdata (usb_intf,NULL );kfree (pdvobjpriv);
@@ -200,7 +173,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)usb_reset_device (interface_to_usbdev (usb_intf)); } } -rtw_deinit_intf_priv (dvobj); +kfree (dvobj); }
Signature · 1 line
2.33.0