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

staging: rtl8188eu: Remove function _rtw_write32() 



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

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

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer, 
			rtw_write16(padapter, addr, (u16)val);

			break;

		case 4:

			rtw_write32(padapter, addr, val);

			usb_write32(padapter, addr, val);

			break;

		default:

			DBG_88E("error write length =%d", len);

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −12
Original line number Diff line number Diff line
@@ -113,18 +113,6 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val) 


	return RTW_STATUS_CODE(ret);

}

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 adapter *pintfhdl, u32 addr, u32 val);

	int ret;

	_write32 = pintfhdl->io_ops._write32;



	ret = _write32(adapter, addr, val);



	return RTW_STATUS_CODE(ret);

}



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

{

drivers/staging/rtl8188eu/core/rtw_mp.c

+8 −8
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz) 
		rtw_write16(padapter, addr, (u16)val);

		break;

	case 4:

		rtw_write32(padapter, addr, val);

		usb_write32(padapter, addr, val);

		break;

	default:

		break;
@@ -221,7 +221,7 @@ s32 MPT_InitializeAdapter(struct adapter *pAdapter, u8 Channel) 
	/*  */



	/*  Don't accept any packets */

	rtw_write32(pAdapter, REG_RCR, 0);

	usb_write32(pAdapter, REG_RCR, 0);



	PHY_IQCalibrate(pAdapter, false);

	dm_CheckTXPowerTracking(&pHalData->odmpriv);	/* trigger thermal meter */
@@ -788,12 +788,12 @@ void SetPacketRx(struct adapter *pAdapter, u8 bStartRx) 


		pHalData->ReceiveConfig |= ACRC32;



		rtw_write32(pAdapter, REG_RCR, pHalData->ReceiveConfig);

		usb_write32(pAdapter, REG_RCR, pHalData->ReceiveConfig);



		/*  Accept all data frames */

		rtw_write16(pAdapter, REG_RXFLTMAP2, 0xFFFF);

	} else {

		rtw_write32(pAdapter, REG_RCR, 0);

		usb_write32(pAdapter, REG_RCR, 0);

	}

}
@@ -805,7 +805,7 @@ void ResetPhyRxPktCount(struct adapter *pAdapter) 
		phyrx_set = 0;

		phyrx_set |= _RXERR_RPT_SEL(i);	/* select */

		phyrx_set |= RXERR_RPT_RST;	/*  set counter to zero */

		rtw_write32(pAdapter, REG_RXERR_RPT, phyrx_set);

		usb_write32(pAdapter, REG_RXERR_RPT, phyrx_set);

	}

}
@@ -815,7 +815,7 @@ static u32 GetPhyRxPktCounts(struct adapter *pAdapter, u32 selbit) 
	u32 phyrx_set = 0, count = 0;



	phyrx_set = _RXERR_RPT_SEL(selbit & 0xF);

	rtw_write32(pAdapter, REG_RXERR_RPT, phyrx_set);

	usb_write32(pAdapter, REG_RXERR_RPT, phyrx_set);



	/* Read packet count */

	count = rtw_read32(pAdapter, REG_RXERR_RPT) & RXERR_COUNTER_MASK;
@@ -857,11 +857,11 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point) 
	psd_val &= 0xFFBFFC00;

	psd_val |= point;



	rtw_write32(pAdapter, 0x808, psd_val);

	usb_write32(pAdapter, 0x808, psd_val);

	mdelay(1);

	psd_val |= 0x00400000;



	rtw_write32(pAdapter, 0x808, psd_val);

	usb_write32(pAdapter, 0x808, psd_val);

	mdelay(1);

	psd_val = rtw_read32(pAdapter, 0x8B4);

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) 
		rtw_write16(padapter, offset, (u16)value);

		break;

	case 4:

		rtw_write32(padapter, offset, value);

		usb_write32(padapter, offset, value);

		break;

	default:

		status = NDIS_STATUS_NOT_ACCEPTED;

drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ _PHY_ReloadMACRegisters( 
	for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++) {

		rtw_write8(adapt, MACReg[i], (u8)MACBackup[i]);

	}

	rtw_write32(adapt, MACReg[i], MACBackup[i]);

	usb_write32(adapt, MACReg[i], MACBackup[i]);

}



void