[PATCH RFC 08/11] staging: rtl8723bs: inline sdio_write32() into rtw_write32()

[Nikolay Kulikov <nikolayof23@gmail.com>]

rtw_write32() is a wrapper around sdio_write32(), combining them will
simplify the code and reduce the number of indirect calls.

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

The call sites of rtw_write32() also require _SUCCESS/_FAIL, so we need
to use RTW_STATUS_CODE().

 drivers/staging/rtl8723bs/core/rtw_io.c    | 32 ++++++++++++++----
 drivers/staging/rtl8723bs/hal/sdio_ops.c   | 39 ----------------------
 drivers/staging/rtl8723bs/include/rtw_io.h |  2 --
 3 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index 38c4bdd918b8..f1f3ca46bd15 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -141,16 +141,34 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val)
 
 int rtw_write32(struct adapter *adapter, u32 addr, u32 val)
 {
-	struct io_priv *pio_priv = &adapter->iopriv;
-	struct intf_hdl *pintfhdl = &pio_priv->intf;
-	int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
-	int ret;
+	struct intf_hdl *intfhdl = &adapter->iopriv.intf;
+	u8 mac_pwr_ctrl_on, device_id, shift;
+	__le32 le_tmp;
+	s32 err = 0;
+	u16 offset;
+	u32 ftaddr;
 
-	_write32 = pintfhdl->io_ops._write32;
+	ftaddr = _cvrt2ftaddr(addr, &device_id, &offset);
 
-	ret = _write32(pintfhdl, addr, val);
+	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)) {
+		le_tmp = cpu_to_le32(val);
+		err = sd_cmd52_write(intfhdl, ftaddr, 4, (u8 *)&le_tmp);
+		return RTW_STATUS_CODE(err);
+	}
 
-	return RTW_STATUS_CODE(ret);
+	/*  4 bytes alignment */
+	shift = ftaddr & 0x3;
+	if (shift == 0) {
+		sd_write32(intfhdl, ftaddr, val, &err);
+	} else {
+		le_tmp = cpu_to_le32(val);
+		err = sd_cmd52_write(intfhdl, ftaddr, 4, (u8 *)&le_tmp);
+	}
+
+	return RTW_STATUS_CODE(err);
 }
 
 u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index b6d0774652dc..a162815e24a4 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -124,44 +124,6 @@ u32 _cvrt2ftaddr(const u32 addr, u8 *pdevice_id, u16 *poffset)
 	return ftaddr;
 }
 
-static s32 sdio_write32(struct intf_hdl *intfhdl, u32 addr, u32 val)
-{
-	struct adapter *adapter;
-	u8 mac_pwr_ctrl_on;
-	u8 device_id;
-	u16 offset;
-	u32 ftaddr;
-	u8 shift;
-	s32 err;
-	__le32 le_tmp;
-
-	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)
-	) {
-		le_tmp = cpu_to_le32(val);
-
-		return sd_cmd52_write(intfhdl, ftaddr, 4, (u8 *)&le_tmp);
-	}
-
-	/*  4 bytes alignment */
-	shift = ftaddr & 0x3;
-	if (shift == 0) {
-		sd_write32(intfhdl, ftaddr, val, &err);
-	} else {
-		le_tmp = cpu_to_le32(val);
-		err = sd_cmd52_write(intfhdl, ftaddr, 4, (u8 *)&le_tmp);
-	}
-	return err;
-}
-
 /*
  * Description:
  *Read from RX FIFO
@@ -260,7 +222,6 @@ static u32 sdio_write_port(
 
 void sdio_set_intf_ops(struct adapter *adapter, struct _io_ops *ops)
 {
-	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 db2e00554aff..9fc2f7413543 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -11,8 +11,6 @@
 struct intf_hdl;
 
 struct _io_ops {
-		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