From 6487c49e8a739ae6020ccda9470f5837e792ab53 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 2 Aug 2010 20:51:57 -0300 Subject: [PATCH 509/524] staging: vt6656: removed NTSTATUS definition Replaced NTSTATUS with int, as defined in a couple of places. Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/baseband.c | 6 ++-- drivers/staging/vt6656/control.c | 2 +- drivers/staging/vt6656/device.h | 1 - drivers/staging/vt6656/dpc.c | 2 +- drivers/staging/vt6656/firmware.c | 2 +- drivers/staging/vt6656/int.c | 7 ++--- drivers/staging/vt6656/int.h | 6 +--- drivers/staging/vt6656/main_usb.c | 2 +- drivers/staging/vt6656/mib.c | 7 +---- drivers/staging/vt6656/mib.h | 9 +----- drivers/staging/vt6656/rxtx.c | 9 +----- drivers/staging/vt6656/rxtx.h | 6 ++-- drivers/staging/vt6656/usbpipe.c | 53 ++++++++++--------------------------- drivers/staging/vt6656/usbpipe.h | 33 ++++------------------- drivers/staging/vt6656/wcmd.c | 2 +- 15 files changed, 38 insertions(+), 109 deletions(-) diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index d3de94f..2990249 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -989,10 +989,10 @@ BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode) * Return Value: none * */ -BOOL -BBbVT3184Init (PSDevice pDevice) + +BOOL BBbVT3184Init(PSDevice pDevice) { - NTSTATUS ntStatus; + int ntStatus; WORD wLength; PBYTE pbyAddr; PBYTE pbyAgc; diff --git a/drivers/staging/vt6656/control.c b/drivers/staging/vt6656/control.c index 8aab671..5d8c571 100644 --- a/drivers/staging/vt6656/control.c +++ b/drivers/staging/vt6656/control.c @@ -72,7 +72,7 @@ void ControlvWriteByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs, void ControlvReadByte(PSDevice pDevice, BYTE byRegType, BYTE byRegOfs, PBYTE pbyData) { - NTSTATUS ntStatus; + int ntStatus; BYTE byData1; ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ, diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 9986bad..b9852aa 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -259,7 +259,6 @@ typedef enum _VIA_PKT_TYPE //++ NDIS related #define NDIS_STATUS int -#define NTSTATUS int typedef enum __DEVICE_NDIS_STATUS { STATUS_SUCCESS = 0, diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 33f905c..5e88349 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -1519,7 +1519,7 @@ static BOOL s_bAPModeRxData ( void RXvWorkItem(void *Context) { PSDevice pDevice = (PSDevice) Context; - NTSTATUS ntStatus; + int ntStatus; PRCB pRCB=NULL; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Rx Polling Thread\n"); diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index e1f96d7..ebb9c99 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -848,7 +848,7 @@ FIRMWAREbCheckVersion( PSDevice pDevice ) { - NTSTATUS ntStatus; + int ntStatus; ntStatus = CONTROLnsRequestIn(pDevice, MESSAGE_TYPE_READ, diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c index 89f5b18..c95833a 100644 --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c @@ -82,7 +82,7 @@ static int msglevel = MSG_LEVEL_INFO; void INTvWorkItem(void *Context) { PSDevice pDevice = (PSDevice) Context; - NTSTATUS ntStatus; + int ntStatus; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Interrupt Polling Thread\n"); @@ -92,10 +92,9 @@ void INTvWorkItem(void *Context) spin_unlock_irq(&pDevice->lock); } -NTSTATUS -INTnsProcessData(PSDevice pDevice) +int INTnsProcessData(PSDevice pDevice) { - NTSTATUS status = STATUS_SUCCESS; + int status = STATUS_SUCCESS; PSINTData pINTData; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); struct net_device_stats *pStats = &pDevice->stats; diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h index d32ba35..3176c8d 100644 --- a/drivers/staging/vt6656/int.h +++ b/drivers/staging/vt6656/int.h @@ -68,10 +68,6 @@ SINTData, *PSINTData; /*--------------------- Export Functions --------------------------*/ void INTvWorkItem(void *Context); - -NTSTATUS -INTnsProcessData( - PSDevice pDevice - ); +int INTnsProcessData(PSDevice pDevice); #endif /* __INT_H__ */ diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 0b95db4..c528ef0 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -366,7 +366,7 @@ static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) BYTE byAntenna; unsigned int ii; CMD_CARD_INIT sInitCmd; - NTSTATUS ntStatus = STATUS_SUCCESS; + int ntStatus = STATUS_SUCCESS; RSP_CARD_INIT sInitRsp; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); BYTE byTmp; diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c index 9e64bad..8a6ee72 100644 --- a/drivers/staging/vt6656/mib.c +++ b/drivers/staging/vt6656/mib.c @@ -583,10 +583,7 @@ STAvClear802_11Counter(PSDot11Counters p802_11Counter) * */ -void -STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, - NTSTATUS ntStatus - ) +void STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, int ntStatus) { // if ( ntStatus == USBD_STATUS_CRC ) { @@ -594,5 +591,3 @@ STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, // } } - - diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h index ee73fc6..a89cca0 100644 --- a/drivers/staging/vt6656/mib.h +++ b/drivers/staging/vt6656/mib.h @@ -369,8 +369,6 @@ typedef struct tagSStatCounter { } SStatCounter, *PSStatCounter; -#define NTSTATUS int - /*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Variables --------------------------*/ @@ -407,11 +405,6 @@ STAvUpdate802_11Counter( ); void STAvClear802_11Counter(PSDot11Counters p802_11Counter); - -void -STAvUpdateUSBCounter( - PSUSBCounter pUsbCounter, - NTSTATUS ntStatus - ); +void STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, int ntStatus); #endif /* __MIB_H__ */ diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 887ad26..deca213 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -2729,14 +2729,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { * Return Value: NULL */ - - -NTSTATUS -nsDMA_tx_packet( - PSDevice pDevice, - unsigned int uDMAIdx, - struct sk_buff *skb - ) +int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb) { PSMgmtObject pMgmt = &(pDevice->sMgmtObj); unsigned int BytesToWrite = 0, uHeaderLen = 0; diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index f90de42..f99acf1 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -683,9 +683,9 @@ bPacketToWirelessUsb( ); void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb); -NTSTATUS nsDMA_tx_packet(PSDevice pDevice, - unsigned int uDMAIdx, - struct sk_buff *skb); +int nsDMA_tx_packet(PSDevice pDevice, + unsigned int uDMAIdx, + struct sk_buff *skb); CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 2bdce57..a32785c 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -107,10 +107,7 @@ s_nsControlInUsbIoCompleteWrite( /*--------------------- Export Functions --------------------------*/ - - -NTSTATUS -PIPEnsControlOutAsyn( +int PIPEnsControlOutAsyn( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -119,8 +116,7 @@ PIPEnsControlOutAsyn( PBYTE pbyBuffer ) { - NTSTATUS ntStatus; - + int ntStatus; if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) return STATUS_FAILURE; @@ -156,12 +152,7 @@ PIPEnsControlOutAsyn( return ntStatus; } - - - - -NTSTATUS -PIPEnsControlOut( +int PIPEnsControlOut( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -170,10 +161,9 @@ PIPEnsControlOut( PBYTE pbyBuffer ) { - NTSTATUS ntStatus = 0; + int ntStatus = 0; int ii; - if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) return STATUS_FAILURE; @@ -219,11 +209,7 @@ PIPEnsControlOut( return STATUS_SUCCESS; } - - - -NTSTATUS -PIPEnsControlIn( +int PIPEnsControlIn( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -232,7 +218,7 @@ PIPEnsControlIn( PBYTE pbyBuffer ) { - NTSTATUS ntStatus = 0; + int ntStatus = 0; int ii; if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) @@ -360,13 +346,9 @@ s_nsControlInUsbIoCompleteRead( * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver * */ -NTSTATUS -PIPEnsInterruptRead( - PSDevice pDevice - ) +int PIPEnsInterruptRead(PSDevice pDevice) { - NTSTATUS ntStatus = STATUS_FAILURE; - + int ntStatus = STATUS_FAILURE; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsStartInterruptUsbRead()\n"); @@ -423,8 +405,7 @@ s_nsInterruptUsbIoCompleteRead( { PSDevice pDevice; - NTSTATUS ntStatus; - + int ntStatus; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptUsbIoCompleteRead\n"); // @@ -503,13 +484,9 @@ s_nsInterruptUsbIoCompleteRead( * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver * */ -NTSTATUS -PIPEnsBulkInUsbRead( - PSDevice pDevice, - PRCB pRCB - ) +int PIPEnsBulkInUsbRead(PSDevice pDevice, PRCB pRCB) { - NTSTATUS ntStatus= 0; + int ntStatus = 0; struct urb *pUrb; @@ -579,9 +556,7 @@ s_nsBulkInUsbIoCompleteRead( unsigned long bytesRead; BOOL bIndicateReceive = FALSE; BOOL bReAllocSkb = FALSE; - NTSTATUS status; - - + int status; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkInUsbIoCompleteRead\n"); status = urb->status; @@ -649,7 +624,7 @@ PIPEnsSendBulkOut( PUSB_SEND_CONTEXT pContext ) { - NTSTATUS status; + int status; struct urb *pUrb; @@ -730,7 +705,7 @@ s_nsBulkOutIoCompleteWrite( ) { PSDevice pDevice; - NTSTATUS status; + int status; CONTEXT_TYPE ContextType; unsigned long ulBufLen; PUSB_SEND_CONTEXT pContext; diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h index f852b39..b367347 100644 --- a/drivers/staging/vt6656/usbpipe.h +++ b/drivers/staging/vt6656/usbpipe.h @@ -41,8 +41,7 @@ /*--------------------- Export Functions --------------------------*/ -NTSTATUS -PIPEnsControlOut( +int PIPEnsControlOut( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -51,10 +50,7 @@ PIPEnsControlOut( PBYTE pbyBuffer ); - - -NTSTATUS -PIPEnsControlOutAsyn( +int PIPEnsControlOutAsyn( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -63,8 +59,7 @@ PIPEnsControlOutAsyn( PBYTE pbyBuffer ); -NTSTATUS -PIPEnsControlIn( +int PIPEnsControlIn( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -73,24 +68,8 @@ PIPEnsControlIn( PBYTE pbyBuffer ); - - - -NTSTATUS -PIPEnsInterruptRead( - PSDevice pDevice - ); - -NTSTATUS -PIPEnsBulkInUsbRead( - PSDevice pDevice, - PRCB pRCB - ); - -NTSTATUS -PIPEnsSendBulkOut( - PSDevice pDevice, - PUSB_SEND_CONTEXT pContext - ); +int PIPEnsInterruptRead(PSDevice pDevice); +int PIPEnsBulkInUsbRead(PSDevice pDevice, PRCB pRCB); +int PIPEnsSendBulkOut(PSDevice pDevice, PUSB_SEND_CONTEXT pContext); #endif /* __USBPIPE_H__ */ diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 6610721..686747a 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -878,7 +878,7 @@ void vRunCommand(void *hDeviceContext) // CARDbRadioPowerOff(pDevice); //2008-09-09 BY Mike:Hot Key for Radio On/Off { - NTSTATUS ntStatus = STATUS_SUCCESS; + int ntStatus = STATUS_SUCCESS; BYTE byTmp; ntStatus = CONTROLnsRequestIn(pDevice, -- 1.7.1