openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6656: rename PIPEnsControlIn/CONTROLnsRequestIn with vnt_control_in 

Replace all to CONTROLnsRequestIn with vnt_control_in and remove macro.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-05-26 13:59:02 +01:00 committed by Greg Kroah-Hartman
parent 1390b02a2f
commit 441c21c3f0
8 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vt6656/baseband.c
View File

@ -893,7 +893,7 @@ int BBbVT3184Init(struct vnt_private *priv)
u8 array[256];
u8 data;
status = CONTROLnsRequestIn(priv, MESSAGE_TYPE_READ, 0,
status = vnt_control_in(priv, MESSAGE_TYPE_READ, 0,
MESSAGE_REQUEST_EEPROM, EEP_MAX_CONTEXT_SIZE,
priv->abyEEPROM);
if (status != STATUS_SUCCESS)
@ -1044,7 +1044,7 @@ int BBbVT3184Init(struct vnt_private *priv)
/* Fix for TX USB resets from vendors driver */
CONTROLnsRequestIn(priv, MESSAGE_TYPE_READ, USB_REG4,
vnt_control_in(priv, MESSAGE_TYPE_READ, USB_REG4,
MESSAGE_REQUEST_MEM, sizeof(data), &data);
data |= 0x2;

3
drivers/staging/vt6656/control.c
View File

@ -27,7 +27,6 @@
*
* Functions:
* 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
* ControlvMaskByte - Read one byte from MEM/BB/MAC/EEPROM and clear/set
@ -58,7 +57,7 @@ void ControlvWriteByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,
void ControlvReadByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,
u8 *data)
{
CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ,
vnt_control_in(pDevice, MESSAGE_TYPE_READ,
reg_off, reg, sizeof(u8), data);
return;
}

3
drivers/staging/vt6656/control.h
View File

@ -33,9 +33,6 @@
#include "device.h"
#include "usbpipe.h"
#define CONTROLnsRequestIn(Device, Request, Value, Index, Length, Buffer) \
PIPEnsControlIn(Device, Request, Value, Index, Length, Buffer)
void ControlvWriteByte(struct vnt_private *pDevice, u8 reg, u8 reg_off,
u8 data);

2
drivers/staging/vt6656/firmware.c
View File

@ -116,7 +116,7 @@ int FIRMWAREbCheckVersion(struct vnt_private *pDevice)
{
int ntStatus;
ntStatus = CONTROLnsRequestIn(pDevice,
ntStatus = vnt_control_in(pDevice,
MESSAGE_TYPE_READ,
0,
MESSAGE_REQUEST_VERSION,

8
drivers/staging/vt6656/main_usb.c
View File

@ -322,7 +322,7 @@ static int device_init_registers(struct vnt_private *pDevice)
return false;
}
ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_INIT_RSP, 0, 0,
ntStatus = vnt_control_in(pDevice, MESSAGE_TYPE_INIT_RSP, 0, 0,
sizeof(struct vnt_rsp_card_init), (u8 *)init_rsp);
if (ntStatus != STATUS_SUCCESS) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
@ -331,7 +331,7 @@ static int device_init_registers(struct vnt_private *pDevice)
}
/* local ID for AES functions */
ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ,
ntStatus = vnt_control_in(pDevice, MESSAGE_TYPE_READ,
MAC_REG_LOCALID, MESSAGE_REQUEST_MACREG, 1,
&pDevice->byLocalID);
if (ntStatus != STATUS_SUCCESS)
@ -535,7 +535,7 @@ static int device_init_registers(struct vnt_private *pDevice)
pDevice->bHWRadioOff = false;
if ((pDevice->byRadioCtl & EEP_RADIOCTL_ENABLE) != 0) {
ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ,
ntStatus = vnt_control_in(pDevice, MESSAGE_TYPE_READ,
MAC_REG_GPIOCTL1, MESSAGE_REQUEST_MACREG, 1, &byTmp);
if (ntStatus != STATUS_SUCCESS)
@ -1269,7 +1269,7 @@ void vnt_configure_filter(struct vnt_private *priv)
u8 tmp = 0;
int rc;
rc = CONTROLnsRequestIn(priv, MESSAGE_TYPE_READ,
rc = vnt_control_in(priv, MESSAGE_TYPE_READ,
MAC_REG_RCR, MESSAGE_REQUEST_MACREG, 1, &tmp);
if (rc == 0)
priv->byRxMode = tmp;

4
drivers/staging/vt6656/usbpipe.c
View File

@ -27,7 +27,7 @@
*
* Functions:
* vnt_control_out - Write variable length bytes to MEM/BB/MAC/EEPROM
* CONTROLnsRequestIn - Read variable length bytes from MEM/BB/MAC/EEPROM
* vnt_control_in - 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
* ControlvMaskByte - Read one byte from MEM/BB/MAC/EEPROM and clear/set some bits in the same address
@ -83,7 +83,7 @@ int vnt_control_out(struct vnt_private *priv, u8 request, u16 value,
return STATUS_SUCCESS;
}
int PIPEnsControlIn(struct vnt_private *priv, u8 request, u16 value,
int vnt_control_in(struct vnt_private *priv, u8 request, u16 value,
u16 index, u16 length, u8 *buffer)
{
int status;

3
drivers/staging/vt6656/usbpipe.h
View File

@ -33,8 +33,7 @@
#include "device.h"
int vnt_control_out(struct vnt_private *, u8, u16, u16, u16, u8 *);
int PIPEnsControlIn(struct vnt_private *, u8 byRequest, u16 wValue,
u16 wIndex, u16 wLength, u8 *pbyBuffer);
int vnt_control_in(struct vnt_private *, u8, u16, u16, u16, u8 *);
int PIPEnsInterruptRead(struct vnt_private *);
int PIPEnsBulkInUsbRead(struct vnt_private *, struct vnt_rcb *pRCB);

2
drivers/staging/vt6656/wcmd.c
View File

@ -725,7 +725,7 @@ void vRunCommand(struct work_struct *work)
int ntStatus = STATUS_SUCCESS;
u8 byTmp;
ntStatus = CONTROLnsRequestIn(pDevice,
ntStatus = vnt_control_in(pDevice,
MESSAGE_TYPE_READ,
MAC_REG_GPIOCTL1,
MESSAGE_REQUEST_MACREG,