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

staging: rtl8188eu: Remove function _rtw_write16() 



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

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

drivers/staging/rtl8188eu/core/rtw_debug.c

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

			break;

		case 2:

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

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

			break;

		case 4:

			usb_write32(padapter, addr, val);

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −13
Original line number Diff line number Diff line
@@ -101,19 +101,6 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val) 
	return RTW_STATUS_CODE(ret);

}



int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

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

	int (*_write16)(struct adapter *pintfhdl, u32 addr, u16 val);

	int ret;

	_write16 = pintfhdl->io_ops._write16;



	ret = _write16(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

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz) 
		rtw_write8(padapter, addr, (u8)val);

		break;

	case 2:

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

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

		break;

	case 4:

		usb_write32(padapter, addr, val);
@@ -234,8 +234,8 @@ s32 MPT_InitializeAdapter(struct adapter *pAdapter, u8 Channel) 
	pMptCtx->backup0x52_RF_B = (u8)PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_0x52, 0x000F0);



	/* set ant to wifi side in mp mode */

	rtw_write16(pAdapter, 0x870, 0x300);

	rtw_write16(pAdapter, 0x860, 0x110);

	usb_write16(pAdapter, 0x870, 0x300);

	usb_write16(pAdapter, 0x860, 0x110);



	if (pAdapter->registrypriv.mp_mode == 1)

		pmlmepriv->fw_state = WIFI_MP_STATE;
@@ -791,7 +791,7 @@ void SetPacketRx(struct adapter *pAdapter, u8 bStartRx) 
		usb_write32(pAdapter, REG_RCR, pHalData->ReceiveConfig);



		/*  Accept all data frames */

		rtw_write16(pAdapter, REG_RXFLTMAP2, 0xFFFF);

		usb_write16(pAdapter, REG_RXFLTMAP2, 0xFFFF);

	} else {

		usb_write32(pAdapter, REG_RCR, 0);

	}

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

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

			break;

		}

		rtw_write16(padapter, offset, (u16)value);

		usb_write16(padapter, offset, (u16)value);

		break;

	case 4:

		usb_write32(padapter, offset, value);

drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ void ODM_RA_Set_TxRPT_Time(struct odm_dm_struct *dm_odm, u16 minRptTime) 
{

	struct adapter *adapt = dm_odm->Adapter;



	rtw_write16(adapt, REG_TX_RPT_TIME, minRptTime);

	usb_write16(adapt, REG_TX_RPT_TIME, minRptTime);

}



void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 TxRPT_Len, u32 macid_entry0, u32 macid_entry1)