Commit 1390b02a authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rename PIPEnsControlOut/CONTROLnsRequestOut to vnt_control_out 



Rename all CONTROLnsRequestOut and remove macro from control.h

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88a8926f

drivers/staging/vt6656/baseband.c

+4 −4
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ void BBvSetAntennaMode(struct vnt_private *priv, u8 antenna_mode) 
		break;

	}



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_SET_ANTMD,

	vnt_control_out(priv, MESSAGE_TYPE_SET_ANTMD,

		(u16)antenna_mode, 0, 0, NULL);

}
@@ -1018,12 +1018,12 @@ int BBbVT3184Init(struct vnt_private *priv) 


	memcpy(array, addr, length);



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 0,

	vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,

		MESSAGE_REQUEST_BBREG, length, array);



	memcpy(array, agc, length_agc);



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, 0,

	vnt_control_out(priv, MESSAGE_TYPE_WRITE, 0,

		MESSAGE_REQUEST_BBAGC, length_agc, array);



	if ((priv->byRFType == RF_VT3226) ||
@@ -1049,7 +1049,7 @@ int BBbVT3184Init(struct vnt_private *priv) 


	data |= 0x2;



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, USB_REG4,

	vnt_control_out(priv, MESSAGE_TYPE_WRITE, USB_REG4,

		MESSAGE_REQUEST_MEM, sizeof(data), &data);



	return true;

drivers/staging/vt6656/card.c

+7 −7
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel) 
	/* Set Channel[7] = 0 to tell H/W channel is changing now. */

	MACvRegBitsOff(priv, MAC_REG_CHANNEL, 0xb0);



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_SELECT_CHANNLE,

	vnt_control_out(priv, MESSAGE_TYPE_SELECT_CHANNLE,

					connection_channel, 0, 0, NULL);



	if (priv->byBBType == BB_TYPE_11A) {
@@ -373,7 +373,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) 
		data[16 + i * 2 + 1] = rsv_time[i];

	}



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE,

	vnt_control_out(priv, MESSAGE_TYPE_WRITE,

		MAC_REG_RSPINF_B_1, MESSAGE_REQUEST_MACREG, 34, &data[0]);

}
@@ -461,12 +461,12 @@ void vUpdateIFS(struct vnt_private *priv) 
	data[2] = (u8)priv->uEIFS;

	data[3] = (u8)priv->uSlot;



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, MAC_REG_SIFS,

	vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_SIFS,

		MESSAGE_REQUEST_MACREG, 4, &data[0]);



	max_min |= 0xa0;



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_WRITE, MAC_REG_CWMAXMIN0,

	vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_CWMAXMIN0,

		MESSAGE_REQUEST_MACREG, 1, &max_min);

}
@@ -603,7 +603,7 @@ void CARDvAdjustTSF(struct vnt_private *priv, u8 rx_rate, 
	data[6] = (u8)(tsf_offset >> 48);

	data[7] = (u8)(tsf_offset >> 56);



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_SET_TSFTBTT,

	vnt_control_out(priv, MESSAGE_TYPE_SET_TSFTBTT,

		MESSAGE_REQUEST_TSF, 0, 8, data);

}

/*
@@ -712,7 +712,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, u16 beacon_interval) 
	data[6] = (u8)(next_tbtt >> 48);

	data[7] = (u8)(next_tbtt >> 56);



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_SET_TSFTBTT,

	vnt_control_out(priv, MESSAGE_TYPE_SET_TSFTBTT,

		MESSAGE_REQUEST_TBTT, 0, 8, data);



	return;
@@ -749,7 +749,7 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 tsf, 
	data[6] = (u8)(tsf >> 48);

	data[7] = (u8)(tsf >> 56);



	CONTROLnsRequestOut(priv, MESSAGE_TYPE_SET_TSFTBTT,

	vnt_control_out(priv, MESSAGE_TYPE_SET_TSFTBTT,

		MESSAGE_REQUEST_TBTT, 0, 8, data);



	dev_dbg(&priv->usb->dev, "%s TBTT: %8llx\n", __func__, tsf);

drivers/staging/vt6656/control.c

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 * Date: Apr. 5, 2004

 *

 * Functions:

 *      CONTROLnsRequestOut - Write variable length bytes to MEM/BB/MAC/EEPROM

 *      vnt_control_out - Write variable length bytes to MEM/BB/MAC/EEPROM

 *      CONTROLnsRequestIn - Read variable length bytes from MEM/BB/MAC/EEPROM

 *      ControlvWriteByte - Write one byte to MEM/BB/MAC/EEPROM

 *      ControlvReadByte - Read one byte from MEM/BB/MAC/EEPROM
@@ -49,7 +49,7 @@ void ControlvWriteByte(struct vnt_private *pDevice, u8 reg, u8 reg_off, 
			u8 data)

{



	CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_WRITE, reg_off, reg,

	vnt_control_out(pDevice, MESSAGE_TYPE_WRITE, reg_off, reg,

		sizeof(u8), &data);



	return;
@@ -71,7 +71,7 @@ void ControlvMaskByte(struct vnt_private *pDevice, u8 reg_type, u8 reg_off, 
	reg_data[0] = data;

	reg_data[1] = reg_mask;



	CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_WRITE_MASK, reg_off,

	vnt_control_out(pDevice, MESSAGE_TYPE_WRITE_MASK, reg_off,

			reg_type, ARRAY_SIZE(reg_data), reg_data);



	return;

drivers/staging/vt6656/control.h

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#include "device.h"

#include "usbpipe.h"



#define CONTROLnsRequestOut(Device, Request, Value, Index, Length, Buffer) \

	PIPEnsControlOut(Device, Request, Value, Index, Length, Buffer)



#define CONTROLnsRequestIn(Device, Request, Value, Index, Length, Buffer) \

	PIPEnsControlIn(Device, Request, Value, Index, Length, Buffer)

drivers/staging/vt6656/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) 
		wLength = min_t(int, fw->size - ii, FIRMWARE_CHUNK_SIZE);

		memcpy(pBuffer, fw->data + ii, wLength);



		NdisStatus = CONTROLnsRequestOut(pDevice,

		NdisStatus = vnt_control_out(pDevice,

						0,

						0x1200+ii,

						0x0000,
@@ -100,7 +100,7 @@ int FIRMWAREbBrach2Sram(struct vnt_private *pDevice) 


	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n");



	NdisStatus = CONTROLnsRequestOut(pDevice,

	NdisStatus = vnt_control_out(pDevice,

					1,

					0x1200,

					0x0000,

CRA Git | Maintained and supported by SUSTech CRA and CCSE