lkml.org 
[lkml]   [2021]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/5] staging: rtl8723bs: remove sdio_read_mem() and sdio_readN()
The sdio_read_mem() function is unused. We can remove it along with the
sdio_readN() function that it uses.

Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
---
drivers/staging/rtl8723bs/hal/sdio_ops.c | 56 ----------------------
drivers/staging/rtl8723bs/include/rtw_io.h | 2 -
2 files changed, 58 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 6bd662928ab6..928fa109565e 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -195,51 +195,6 @@ static u32 sdio_read32(struct intf_hdl *intfhdl, u32 addr)
return val;
}

-static s32 sdio_readN(struct intf_hdl *intfhdl, u32 addr, u32 cnt, u8 *buf)
-{
- struct adapter *adapter;
- u8 mac_pwr_ctrl_on;
- u8 device_id;
- u16 offset;
- u32 ftaddr;
- u8 shift;
- s32 err;
-
- adapter = intfhdl->padapter;
- err = 0;
-
- ftaddr = _cvrt2ftaddr(addr, &device_id, &offset);
-
- rtw_hal_get_hwreg(adapter, HW_VAR_APFM_ON_MAC, &mac_pwr_ctrl_on);
- if (
- ((device_id == WLAN_IOREG_DEVICE_ID) && (offset < 0x100)) ||
- (!mac_pwr_ctrl_on) ||
- (adapter_to_pwrctl(adapter)->fw_current_in_ps_mode)
- )
- return sd_cmd52_read(intfhdl, ftaddr, cnt, buf);
-
- /* 4 bytes alignment */
- shift = ftaddr & 0x3;
- if (shift == 0) {
- err = sd_read(intfhdl, ftaddr, cnt, buf);
- } else {
- u8 *tmpbuf;
- u32 n;
-
- ftaddr &= ~(u16)0x3;
- n = cnt + shift;
- tmpbuf = rtw_malloc(n);
- if (!tmpbuf)
- return -1;
-
- err = sd_read(intfhdl, ftaddr, n, tmpbuf);
- if (!err)
- memcpy(buf, tmpbuf + shift, cnt);
- kfree(tmpbuf);
- }
- return err;
-}
-
static s32 sdio_write8(struct intf_hdl *intfhdl, u32 addr, u8 val)
{
u32 ftaddr;
@@ -299,16 +254,6 @@ static s32 sdio_write32(struct intf_hdl *intfhdl, u32 addr, u32 val)
return err;
}

-static void sdio_read_mem(
- struct intf_hdl *intfhdl,
- u32 addr,
- u32 cnt,
- u8 *rmem
-)
-{
- sdio_readN(intfhdl, addr, cnt, rmem);
-}
-
/*
* Description:
*Read from RX FIFO
@@ -410,7 +355,6 @@ void sdio_set_intf_ops(struct adapter *adapter, struct _io_ops *ops)
ops->_read8 = &sdio_read8;
ops->_read16 = &sdio_read16;
ops->_read32 = &sdio_read32;
- ops->_read_mem = &sdio_read_mem;
ops->_read_port = &sdio_read_port;

ops->_write8 = &sdio_write8;
diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index 0753e20cfaa2..43102f65bddd 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -89,8 +89,6 @@ struct _io_ops {
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 (*_sync_irp_protocol_rw)(struct io_queue *pio_q);

u32 (*_read_interrupt)(struct intf_hdl *pintfhdl, u32 addr);
--
2.30.2

\
 
 \ /
  Last update: 2021-08-27 18:15    [W:0.036 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site