lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 08/18] staging: r8188eu: remove the helpers of usb_writeN()
    Date
    From: Pavel Skripkin <paskripkin@gmail.com>

    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.

    Co-developed-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
    Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
    Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
    ---

    v3->v4:
    Split a patch into fourteen.
    v2->v3:
    No changes.
    v1->v2:
    No changes.

    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(-)

    diff --git a/drivers/staging/r8188eu/core/rtw_io.c b/drivers/staging/r8188eu/core/rtw_io.c
    index 98c9823fe53b..b2e41fa48d81 100644
    --- a/drivers/staging/r8188eu/core/rtw_io.c
    +++ b/drivers/staging/r8188eu/core/rtw_io.c
    @@ -34,20 +34,6 @@ jackson@realtek.com.tw
    #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;
    diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
    index 73f90b21364e..90fb46c75159 100644
    --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
    +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
    @@ -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;
    diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h
    index 83e2ed13b667..1123017cac65 100644
    --- a/drivers/staging/r8188eu/include/rtw_io.h
    +++ b/drivers/staging/r8188eu/include/rtw_io.h
    @@ -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) \
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-09-13 20:11    [W:4.416 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site