staging: rtl8723bs: remove sd_f0_read8()

The sd_f0_read8() function, which is used by the sdio_f0_read8()
function, are not used anywhere in the driver and both can be
safely removed.

Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/20210524195144.1943280-1-hello@bryanbrattlof.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 196b2232c17d087b6f1958eb0e82d00cfc2283e8..2dd251ce177ee76c6e0cfd41c2e6ec4a74e3407d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -346,11 +346,6 @@ static s32 sdio_writeN(struct intf_hdl *intfhdl, u32 addr, u32 cnt, u8 *buf)
        return err;
 }
 
-static u8 sdio_f0_read8(struct intf_hdl *intfhdl, u32 addr)
-{
-       return sd_f0_read8(intfhdl, addr, NULL);
-}
-
 static void sdio_read_mem(
        struct intf_hdl *intfhdl,
        u32 addr,
@@ -481,8 +476,6 @@ void sdio_set_intf_ops(struct adapter *adapter, struct _io_ops *ops)
        ops->_writeN = &sdio_writeN;
        ops->_write_mem = &sdio_write_mem;
        ops->_write_port = &sdio_write_port;
-
-       ops->_sd_f0_read8 = sdio_f0_read8;
 }
 
 /*

diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index ab3c5ffe011b9f49fa45a4758934f636caca0e17..e98083a07a66006ff684cca9f7347e88d6c43086 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -104,8 +104,6 @@ struct _io_ops {
 
                void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
                void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
-
-               u8 (*_sd_f0_read8)(struct intf_hdl *pintfhdl, u32 addr);
 };
 
 struct io_req {

diff --git a/drivers/staging/rtl8723bs/include/sdio_ops_linux.h b/drivers/staging/rtl8723bs/include/sdio_ops_linux.h
index 16a03adbc2cf244e157590ee02ca9004f8508193..18830dd1837246c825ed3f3838f1364d54e1bc5a 100644 (file)
--- a/drivers/staging/rtl8723bs/include/sdio_ops_linux.h
+++ b/drivers/staging/rtl8723bs/include/sdio_ops_linux.h
@@ -11,8 +11,6 @@
 #define SDIO_ERR_VAL16 0xEAEA
 #define SDIO_ERR_VAL32 0xEAEAEAEA
 
-u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err);
-
 s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata);
 s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata);
 s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata);

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c b/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
index 5cedf775b6ef3c2c1491b3e76247cfec2fa491ca..bed930760656381159979e6c9e4c4d411604a4d0 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
@@ -26,34 +26,6 @@ inline void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl)
        sdio_data->sys_sdio_irq_thd = thd_hdl;
 }
 
-u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err)
-{
-       struct adapter *padapter;
-       struct dvobj_priv *psdiodev;
-       struct sdio_data *psdio;
-
-       u8 v = 0;
-       struct sdio_func *func;
-       bool claim_needed;
-
-       padapter = pintfhdl->padapter;
-       psdiodev = pintfhdl->pintf_dev;
-       psdio = &psdiodev->intf_data;
-
-       if (padapter->bSurpriseRemoved)
-               return v;
-
-       func = psdio->func;
-       claim_needed = rtw_sdio_claim_host_needed(func);
-
-       if (claim_needed)
-               sdio_claim_host(func);
-       v = sdio_f0_readb(func, addr, err);
-       if (claim_needed)
-               sdio_release_host(func);
-       return v;
-}
-
 /*
  * Return:
  *0            Success