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

staging: rtl8188eu: Remove function _rtw_write8() 



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

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

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer, 
		}

		switch (len) {

		case 1:

			rtw_write8(padapter, addr, (u8)val);

			usb_write8(padapter, addr, (u8)val);

			break;

		case 2:

			usb_write16(padapter, addr, (u16)val);

drivers/staging/rtl8188eu/core/rtw_efuse.c

+13 −13
Original line number Diff line number Diff line
@@ -181,13 +181,13 @@ ReadEFuseByte( 
	}



	/* Write Address */

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

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

	readbyte = rtw_read8(Adapter, EFUSE_CTRL+2);

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

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



	/* Write bit 32 0 */

	readbyte = rtw_read8(Adapter, EFUSE_CTRL+3);

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

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



	/* Check bit 32 read-ready */

	retry = 0;
@@ -263,16 +263,16 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address) 
	if (Address < contentLen) {	/* E-fuse 512Byte */

		/* Write E-fuse Register address bit0~7 */

		temp = Address & 0xFF;

		rtw_write8(Adapter, EFUSE_CTRL+1, temp);

		usb_write8(Adapter, EFUSE_CTRL+1, temp);

		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);

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

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

		rtw_write8(Adapter, EFUSE_CTRL+2, temp);

		usb_write8(Adapter, EFUSE_CTRL+2, temp);



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

		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);

		temp = Bytetemp & 0x7F;

		rtw_write8(Adapter, EFUSE_CTRL+3, temp);

		usb_write8(Adapter, EFUSE_CTRL+3, temp);



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

		Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
@@ -304,11 +304,11 @@ u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, bool pseudo) 
	}

	/*  -----------------e-fuse reg ctrl --------------------------------- */

	/* address */

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

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

	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));



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

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



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

		tmpidx++;
@@ -335,13 +335,13 @@ u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool pseudo) 


	/*  -----------------e-fuse reg ctrl --------------------------------- */

	/* address */

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

	rtw_write8(pAdapter, EFUSE_CTRL+2,

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

	usb_write8(pAdapter, EFUSE_CTRL+2,

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

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

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

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



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

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



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

		tmpidx++;

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −13
Original line number Diff line number Diff line
@@ -88,19 +88,6 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr) 
	return r_val;

}



int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

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

	int (*_write8)(struct adapter *pintfhdl, u32 addr, u8 val);

	int ret;

	_write8 = pintfhdl->io_ops._write8;



	ret = _write8(adapter, addr, val);



	return RTW_STATUS_CODE(ret);

}



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
@@ -50,7 +50,7 @@ void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz) 
{

	switch (sz) {

	case 1:

		rtw_write8(padapter, addr, (u8)val);

		usb_write8(padapter, addr, (u8)val);

		break;

	case 2:

		usb_write16(padapter, addr, (u16)val);
@@ -304,7 +304,7 @@ static void disable_dm(struct adapter *padapter) 
	/*  disable Power Training, Rate Adaptive */

	v8 = rtw_read8(padapter, REG_BCN_CTRL);

	v8 &= ~EN_BCN_FUNCTION;

	rtw_write8(padapter, REG_BCN_CTRL, v8);

	usb_write8(padapter, REG_BCN_CTRL, v8);



	/* 3 2. disable driver dynamic mechanism */

	/*  disable Dynamic Initial Gain */
@@ -423,7 +423,7 @@ s32 mp_start_test(struct adapter *padapter) 
		/*  set MSR to WIFI_FW_ADHOC_STATE */

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

		val8 |= WIFI_FW_ADHOC_STATE;

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

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

	}

	return res;

}

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) 
			status = NDIS_STATUS_NOT_ACCEPTED;

			break;

		}

		rtw_write8(padapter, offset, (u8)value);

		usb_write8(padapter, offset, (u8)value);

		break;

	case 2:

		if (value > 0xFFFF) {