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

staging: rtl8188eu: Remove function _rtw_read16() 



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

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

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int proc_get_read_reg(char *page, char **start, 
		len += snprintf(page + len, count - len, "rtw_read8(0x%x)=0x%x\n", proc_get_read_addr, rtw_read8(padapter, proc_get_read_addr));

		break;

	case 2:

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

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

		break;

	case 4:

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

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −12
Original line number Diff line number Diff line
@@ -64,18 +64,6 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr) 
	return r_val;

}



u16 _rtw_read16(struct adapter *adapter, u32 addr)

{

	u16 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

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

	u16 (*_read16)(struct adapter *pintfhdl, u32 addr);

	_read16 = pintfhdl->io_ops._read16;



	r_val = _read16(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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz) 
		val = rtw_read8(padapter, addr);

		break;

	case 2:

		val = rtw_read16(padapter, addr);

		val = usb_read16(padapter, addr);

		break;

	case 4:

		val = usb_read32(padapter, addr);

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) 
		RegRWStruct->value = rtw_read8(Adapter, offset);

		break;

	case 2:

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

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

		break;

	default:

		width = 4;

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+4 −4
Original line number Diff line number Diff line
@@ -763,20 +763,20 @@ hal_EfusePowerSwitch_RTL8188E( 
		usb_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON);



		/*  1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid */

		tmpV16 = rtw_read16(pAdapter, REG_SYS_ISO_CTRL);

		tmpV16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);

		if (!(tmpV16 & PWC_EV12V)) {

			tmpV16 |= PWC_EV12V;

			 usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpV16);

		}

		/*  Reset: 0x0000h[28], default valid */

		tmpV16 =  rtw_read16(pAdapter, REG_SYS_FUNC_EN);

		tmpV16 =  usb_read16(pAdapter, REG_SYS_FUNC_EN);

		if (!(tmpV16 & FEN_ELDR)) {

			tmpV16 |= FEN_ELDR;

			usb_write16(pAdapter, REG_SYS_FUNC_EN, tmpV16);

		}



		/*  Clock: Gated(0x0008h[5]) 8M(0x0008h[1]) clock from ANA, default valid */

		tmpV16 = rtw_read16(pAdapter, REG_SYS_CLKR);

		tmpV16 = usb_read16(pAdapter, REG_SYS_CLKR);

		if ((!(tmpV16 & LOADER_CLK_EN))  || (!(tmpV16 & ANA8M))) {

			tmpV16 |= (LOADER_CLK_EN | ANA8M);

			usb_write16(pAdapter, REG_SYS_CLKR, tmpV16);
@@ -1882,7 +1882,7 @@ u8 GetEEPROMSize8188E(struct adapter *padapter) 
	u8 size = 0;

	u32	cr;



	cr = rtw_read16(padapter, REG_9346CR);

	cr = usb_read16(padapter, REG_9346CR);

	/*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */

	size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;