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 12/18] staging: r8188eu: remove the helpers of rtw_write_port_cancel()
    Date
    From: Pavel Skripkin <paskripkin@gmail.com>

    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.

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

    diff --git a/drivers/staging/r8188eu/core/rtw_io.c b/drivers/staging/r8188eu/core/rtw_io.c
    index a57742057a65..74b02ff8e44d 100644
    --- a/drivers/staging/r8188eu/core/rtw_io.c
    +++ b/drivers/staging/r8188eu/core/rtw_io.c
    @@ -93,18 +93,6 @@ u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pme
    return 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;
    diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
    index 1865a26142bc..2516cfc464a9 100644
    --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
    +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
    @@ -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)
    diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h
    index 56e17e2a7ee2..4f4678a55687 100644
    --- a/drivers/staging/r8188eu/include/rtw_io.h
    +++ b/drivers/staging/r8188eu/include/rtw_io.h
    @@ -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);
    diff --git a/drivers/staging/r8188eu/include/usb_ops_linux.h b/drivers/staging/r8188eu/include/usb_ops_linux.h
    index 186c6b7628dc..641f059ffaf7 100644
    --- a/drivers/staging/r8188eu/include/usb_ops_linux.h
    +++ b/drivers/staging/r8188eu/include/usb_ops_linux.h
    @@ -28,6 +28,4 @@

    unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);

    -void usb_write_port_cancel(struct intf_hdl *pintfhdl);
    -
    #endif
    diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
    index a98ffdf92ed4..4085f3e6067d 100644
    --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
    +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
    @@ -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__);
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-09-13 20:13    [W:3.770 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site