[PATCH RFC 07/11] staging: rtl8723bs: inline sdio_write16() into rtw_write16()

[Nikolay Kulikov <nikolayof23@gmail.com>]

rtw_write16() is just a wrapper around sdio_write16(), so combine them
to simplify the code.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---

The return value of this function is never read (I checked with commands
	git grep -rn -C2 "\brtw_write16\b"
	git grep -rn -C2 "= \brtw_write16\b"
from the drivers/staging/rtl8723bs/ directory), so perhaps normal error
handling can be done here?

 drivers/staging/rtl8723bs/core/rtw_io.c    | 12 ++++++------
 drivers/staging/rtl8723bs/hal/sdio_ops.c   | 11 -----------
 drivers/staging/rtl8723bs/include/rtw_io.h |  1 -
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index 1a7988a376ec..38c4bdd918b8 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -128,14 +128,14 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val)
 
 int rtw_write16(struct adapter *adapter, u32 addr, u16 val)
 {
-	struct io_priv *pio_priv = &adapter->iopriv;
-	struct intf_hdl *pintfhdl = &pio_priv->intf;
-	int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
+	struct intf_hdl *intfhdl = &adapter->iopriv.intf;
+	__le16 le_tmp;
+	u32 ftaddr;
 	int ret;
 
-	_write16 = pintfhdl->io_ops._write16;
-
-	ret = _write16(pintfhdl, addr, val);
+	ftaddr = _cvrt2ftaddr(addr, NULL, NULL);
+	le_tmp = cpu_to_le16(val);
+	ret = sd_cmd52_write(intfhdl, ftaddr, 2, (u8 *)&le_tmp);
 	return RTW_STATUS_CODE(ret);
 }
 
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 672b577016ac..b6d0774652dc 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -124,16 +124,6 @@ u32 _cvrt2ftaddr(const u32 addr, u8 *pdevice_id, u16 *poffset)
 	return ftaddr;
 }
 
-static s32 sdio_write16(struct intf_hdl *intfhdl, u32 addr, u16 val)
-{
-	u32 ftaddr;
-	__le16 le_tmp;
-
-	ftaddr = _cvrt2ftaddr(addr, NULL, NULL);
-	le_tmp = cpu_to_le16(val);
-	return sd_cmd52_write(intfhdl, ftaddr, 2, (u8 *)&le_tmp);
-}
-
 static s32 sdio_write32(struct intf_hdl *intfhdl, u32 addr, u32 val)
 {
 	struct adapter *adapter;
@@ -270,7 +260,6 @@ static u32 sdio_write_port(
 
 void sdio_set_intf_ops(struct adapter *adapter, struct _io_ops *ops)
 {
-	ops->_write16 = &sdio_write16;
 	ops->_write32 = &sdio_write32;
 	ops->_write_port = &sdio_write_port;
 }
diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index 363c91b213f6..db2e00554aff 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -11,7 +11,6 @@
 struct intf_hdl;
 
 struct _io_ops {
-		int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
 		int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
 
 		u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
-- 
2.54.0