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

staging: rtl8188eu: Remove function _rtw_read32() 



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

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

drivers/staging/rtl8188eu/core/rtw_debug.c

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

		break;

	case 4:

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

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

		break;

	default:

		len += snprintf(page + len, count - len, "error read length=%d\n", proc_get_read_len);
@@ -326,7 +326,7 @@ int proc_get_mac_reg_dump1(char *page, char **start, 
	for (i = 0x0; i < 0x300; i += 4) {

		if (j%4 == 1)

			len += snprintf(page + len, count - len, "0x%02x", i);

		len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i));

		len += snprintf(page + len, count - len, " 0x%08x ", usb_read32(padapter, i));

		if ((j++)%4 == 0)

			len += snprintf(page + len, count - len, "\n");

	}
@@ -349,7 +349,7 @@ int proc_get_mac_reg_dump2(char *page, char **start, 
	for (i = 0x300; i < 0x600; i += 4) {

		if (j%4 == 1)

			len += snprintf(page + len, count - len, "0x%02x", i);

		len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i));

		len += snprintf(page + len, count - len, " 0x%08x ", usb_read32(padapter, i));

		if ((j++)%4 == 0)

			len += snprintf(page + len, count - len, "\n");

	}
@@ -372,7 +372,7 @@ int proc_get_mac_reg_dump3(char *page, char **start, 
	for (i = 0x600; i < 0x800; i += 4) {

		if (j%4 == 1)

			len += snprintf(page + len, count - len, "0x%02x", i);

		len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i));

		len += snprintf(page + len, count - len, " 0x%08x ", usb_read32(padapter, i));

		if ((j++)%4 == 0)

			len += snprintf(page + len, count - len, "\n");

	}
@@ -394,7 +394,7 @@ int proc_get_bb_reg_dump1(char *page, char **start, 
	for (i = 0x800; i < 0xB00; i += 4) {

		if (j%4 == 1)

			len += snprintf(page + len, count - len, "0x%02x", i);

		len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i));

		len += snprintf(page + len, count - len, " 0x%08x ", usb_read32(padapter, i));

		if ((j++)%4 == 0)

			len += snprintf(page + len, count - len, "\n");

	}
@@ -415,7 +415,7 @@ int proc_get_bb_reg_dump2(char *page, char **start, 
	for (i = 0xB00; i < 0xE00; i += 4) {

		if (j%4 == 1)

			len += snprintf(page + len, count - len, "0x%02x", i);

		len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i));

		len += snprintf(page + len, count - len, " 0x%08x ", usb_read32(padapter, i));

		if ((j++)%4 == 0)

			len += snprintf(page + len, count - len, "\n");

	}
@@ -436,7 +436,7 @@ int proc_get_bb_reg_dump3(char *page, char **start, 
	for (i = 0xE00; i < 0x1000; i += 4) {

		if (j%4 == 1)

			len += snprintf(page + len, count - len, "0x%02x", i);

		len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i));

		len += snprintf(page + len, count - len, " 0x%08x ", usb_read32(padapter, i));

		if ((j++)%4 == 0)

			len += snprintf(page + len, count - len, "\n");

	}

drivers/staging/rtl8188eu/core/rtw_efuse.c

+3 −3
Original line number Diff line number Diff line
@@ -191,9 +191,9 @@ ReadEFuseByte( 


	/* Check bit 32 read-ready */

	retry = 0;

	value32 = rtw_read32(Adapter, EFUSE_CTRL);

	value32 = usb_read32(Adapter, EFUSE_CTRL);

	while (!(((value32 >> 24) & 0xff) & 0x80)  && (retry < 10000)) {

		value32 = rtw_read32(Adapter, EFUSE_CTRL);

		value32 = usb_read32(Adapter, EFUSE_CTRL);

		retry++;

	}
@@ -202,7 +202,7 @@ ReadEFuseByte( 
	/*  Designer says that there shall be some delay after ready bit is set, or the */

	/*  result will always stay on last data we read. */

	udelay(50);

	value32 = rtw_read32(Adapter, EFUSE_CTRL);

	value32 = usb_read32(Adapter, EFUSE_CTRL);



	*pbuf = (u8)(value32 & 0xff);

}

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −12
Original line number Diff line number Diff line
@@ -76,18 +76,6 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr) 
	return r_val;

}



u32 _rtw_read32(struct adapter *adapter, u32 addr)

{

	u32 r_val;

	struct io_priv *pio_priv = &adapter->iopriv;

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

	u32	(*_read32)(struct adapter *pintfhdl, u32 addr);

	_read32 = pintfhdl->io_ops._read32;



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

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz) 
		val = rtw_read16(padapter, addr);

		break;

	case 4:

		val = rtw_read32(padapter, addr);

		val = usb_read32(padapter, addr);

		break;

	default:

		val = 0xffffffff;
@@ -818,7 +818,7 @@ static u32 GetPhyRxPktCounts(struct adapter *pAdapter, u32 selbit) 
	usb_write32(pAdapter, REG_RXERR_RPT, phyrx_set);



	/* Read packet count */

	count = rtw_read32(pAdapter, REG_RXERR_RPT) & RXERR_COUNTER_MASK;

	count = usb_read32(pAdapter, REG_RXERR_RPT) & RXERR_COUNTER_MASK;



	return count;

}
@@ -853,7 +853,7 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point) 
	int psd_val;





	psd_val = rtw_read32(pAdapter, 0x808);

	psd_val = usb_read32(pAdapter, 0x808);

	psd_val &= 0xFFBFFC00;

	psd_val |= point;
@@ -863,7 +863,7 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point) 


	usb_write32(pAdapter, 0x808, psd_val);

	mdelay(1);

	psd_val = rtw_read32(pAdapter, 0x8B4);

	psd_val = usb_read32(pAdapter, 0x8B4);



	psd_val &= 0x0000FFFF;

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

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

	default:

		width = 4;

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

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

		break;

	}

	RT_TRACE(_module_mp_, _drv_notice_,