Commit c7b2e995 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Remove function _rtw_read8() 



_rtw_read8() is a wrapper function, being used to call usb_read8().
Call usb_read8() directly and drop _rtw_read8().

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 551a3972

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int proc_get_read_reg(char *page, char **start, 


	switch (proc_get_read_len) {

	case 1:

		len += snprintf(page + len, count - len, "rtw_read8(0x%x)=0x%x\n", proc_get_read_addr, rtw_read8(padapter, proc_get_read_addr));

		len += snprintf(page + len, count - len, "usb_read8(0x%x)=0x%x\n", proc_get_read_addr, usb_read8(padapter, proc_get_read_addr));

		break;

	case 2:

		len += snprintf(page + len, count - len, "usb_read16(0x%x)=0x%x\n", proc_get_read_addr, usb_read16(padapter, proc_get_read_addr));

drivers/staging/rtl8188eu/core/rtw_efuse.c

+12 −12
Original line number Diff line number Diff line
@@ -182,11 +182,11 @@ ReadEFuseByte( 


	/* Write Address */

	usb_write8(Adapter, EFUSE_CTRL+1, (_offset & 0xff));

	readbyte = rtw_read8(Adapter, EFUSE_CTRL+2);

	readbyte = usb_read8(Adapter, EFUSE_CTRL+2);

	usb_write8(Adapter, EFUSE_CTRL+2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc));



	/* Write bit 32 0 */

	readbyte = rtw_read8(Adapter, EFUSE_CTRL+3);

	readbyte = usb_read8(Adapter, EFUSE_CTRL+3);

	usb_write8(Adapter, EFUSE_CTRL+3, (readbyte & 0x7f));



	/* Check bit 32 read-ready */
@@ -264,27 +264,27 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address) 
		/* Write E-fuse Register address bit0~7 */

		temp = Address & 0xFF;

		usb_write8(Adapter, EFUSE_CTRL+1, temp);

		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);

		Bytetemp = usb_read8(Adapter, EFUSE_CTRL+2);

		/* Write E-fuse Register address bit8~9 */

		temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);

		usb_write8(Adapter, EFUSE_CTRL+2, temp);



		/* Write 0x30[31]= 0 */

		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);

		Bytetemp = usb_read8(Adapter, EFUSE_CTRL+3);

		temp = Bytetemp & 0x7F;

		usb_write8(Adapter, EFUSE_CTRL+3, temp);



		/* Wait Write-ready (0x30[31]= 1) */

		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);

		Bytetemp = usb_read8(Adapter, EFUSE_CTRL+3);

		while (!(Bytetemp & 0x80)) {

			Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);

			Bytetemp = usb_read8(Adapter, EFUSE_CTRL+3);

			k++;

			if (k == 1000) {

				k = 0;

				break;

			}

		}

		data = rtw_read8(Adapter, EFUSE_CTRL);

		data = usb_read8(Adapter, EFUSE_CTRL);

		return data;

	} else {

		return 0xFF;
@@ -306,14 +306,14 @@ u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, bool pseudo) 
	/* address */

	usb_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr & 0xff));

	usb_write8(pAdapter, EFUSE_CTRL+2, ((u8)((addr>>8) & 0x03)) |

		   (rtw_read8(pAdapter, EFUSE_CTRL+2) & 0xFC));

		   (usb_read8(pAdapter, EFUSE_CTRL+2) & 0xFC));



	usb_write8(pAdapter, EFUSE_CTRL+3,  0x72);/* read cmd */



	while (!(0x80 & rtw_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx < 100))

	while (!(0x80 & usb_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx < 100))

		tmpidx++;

	if (tmpidx < 100) {

		*data = rtw_read8(pAdapter, EFUSE_CTRL);

		*data = usb_read8(pAdapter, EFUSE_CTRL);

		result = true;

	} else {

		*data = 0xff;
@@ -337,13 +337,13 @@ u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool pseudo) 
	/* address */

	usb_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff));

	usb_write8(pAdapter, EFUSE_CTRL+2,

		   (rtw_read8(pAdapter, EFUSE_CTRL+2) & 0xFC) |

		   (usb_read8(pAdapter, EFUSE_CTRL+2) & 0xFC) |

		   (u8)((addr>>8) & 0x03));

	usb_write8(pAdapter, EFUSE_CTRL, data);/* data */



	usb_write8(pAdapter, EFUSE_CTRL+3, 0xF2);/* write cmd */



	while ((0x80 &  rtw_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx < 100))

	while ((0x80 &  usb_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx < 100))

		tmpidx++;



	if (tmpidx < 100)

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −13
Original line number Diff line number Diff line
@@ -51,19 +51,6 @@ jackson@realtek.com.tw 
#define rtw_cpu_to_le16(val)		cpu_to_le16(val)

#define rtw_cpu_to_le32(val)		cpu_to_le32(val)





u8 _rtw_read8(struct adapter *adapter, u32 addr)

{

	u8 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl *pintfhdl = &(pio_priv->intf);

	u8 (*_read8)(struct adapter *pintfhdl, u32 addr);



	_read8 = pintfhdl->io_ops._read8;

	r_val = _read8(adapter, addr);

	return r_val;

}



int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops))

{

	struct io_priv	*piopriv = &padapter->iopriv;

drivers/staging/rtl8188eu/core/rtw_mp.c

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz) 


	switch (sz) {

	case 1:

		val = rtw_read8(padapter, addr);

		val = usb_read8(padapter, addr);

		break;

	case 2:

		val = usb_read16(padapter, addr);
@@ -302,7 +302,7 @@ static void disable_dm(struct adapter *padapter) 


	/* 3 1. disable firmware dynamic mechanism */

	/*  disable Power Training, Rate Adaptive */

	v8 = rtw_read8(padapter, REG_BCN_CTRL);

	v8 = usb_read8(padapter, REG_BCN_CTRL);

	v8 &= ~EN_BCN_FUNCTION;

	usb_write8(padapter, REG_BCN_CTRL, v8);
@@ -421,7 +421,7 @@ s32 mp_start_test(struct adapter *padapter) 


	if (res == _SUCCESS) {

		/*  set MSR to WIFI_FW_ADHOC_STATE */

		val8 = rtw_read8(padapter, MSR) & 0xFC; /*  0x0102 */

		val8 = usb_read8(padapter, MSR) & 0xFC; /*  0x0102 */

		val8 |= WIFI_FW_ADHOC_STATE;

		usb_write8(padapter, MSR, val8); /*  Link in ad hoc network */

	}

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) 


	switch (width) {

	case 1:

		RegRWStruct->value = rtw_read8(Adapter, offset);

		RegRWStruct->value = usb_read8(Adapter, offset);

		break;

	case 2:

		RegRWStruct->value = usb_read16(Adapter, offset);