From: Bryan Brattlof Date: Tue, 18 May 2021 18:30:53 +0000 (+0000) Subject: staging: rtl8723bs: remove _rtw_sd_f0_read8() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=73861d26a5f430116a82c2e77edb9ee16cafae88;p=linux.git staging: rtl8723bs: remove _rtw_sd_f0_read8() Both the _rtw_sd_f0_read8() function and the rtw_sd_f0_read8() redefinition are used anywhere in the driver and can be removed. Signed-off-by: Bryan Brattlof Link: https://lore.kernel.org/r/5f025724ea7149e6ff11f94352b3321833f9bcaf.1621361919.git-series.hello@bryanbrattlof.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c index 6de549e90999a..856e23398c031 100644 --- a/drivers/staging/rtl8723bs/core/rtw_io.c +++ b/drivers/staging/rtl8723bs/core/rtw_io.c @@ -116,25 +116,6 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val) return RTW_STATUS_CODE(ret); } -u8 _rtw_sd_f0_read8(struct adapter *adapter, u32 addr) -{ - u8 r_val = 0x00; - struct io_priv *pio_priv = &adapter->iopriv; - struct intf_hdl *pintfhdl = &(pio_priv->intf); - u8 (*_sd_f0_read8)(struct intf_hdl *pintfhdl, u32 addr); - - _sd_f0_read8 = pintfhdl->io_ops._sd_f0_read8; - - if (_sd_f0_read8) - r_val = _sd_f0_read8(pintfhdl, addr); - else - netdev_warn(adapter->pnetdev, - FUNC_ADPT_FMT " _sd_f0_read8 callback is NULL\n", - FUNC_ADPT_ARG(adapter)); - - return r_val; -} - 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); diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h index 48e1352ac48ab..ab3c5ffe011b9 100644 --- a/drivers/staging/rtl8723bs/include/rtw_io.h +++ b/drivers/staging/rtl8723bs/include/rtw_io.h @@ -178,12 +178,8 @@ extern int rtw_write8(struct adapter *adapter, u32 addr, u8 val); extern int rtw_write16(struct adapter *adapter, u32 addr, u16 val); extern int rtw_write32(struct adapter *adapter, u32 addr, u32 val); -extern u8 _rtw_sd_f0_read8(struct adapter *adapter, u32 addr); - extern u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -#define rtw_sd_f0_read8(adapter, addr) _rtw_sd_f0_read8((adapter), (addr)) - extern void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem); /* ioreq */