mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
staging: vt6656: removed NTSTATUS definition
Replaced NTSTATUS with int, as defined in a couple of places. Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
22040bbf84
commit
6487c49e8a
15 changed files with 38 additions and 109 deletions
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -848,7 +848,7 @@ FIRMWAREbCheckVersion(
|
|||
PSDevice pDevice
|
||||
)
|
||||
{
|
||||
NTSTATUS ntStatus;
|
||||
int ntStatus;
|
||||
|
||||
ntStatus = CONTROLnsRequestIn(pDevice,
|
||||
MESSAGE_TYPE_READ,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -68,10 +68,6 @@ SINTData, *PSINTData;
|
|||
/*--------------------- Export Functions --------------------------*/
|
||||
|
||||
void INTvWorkItem(void *Context);
|
||||
|
||||
NTSTATUS
|
||||
INTnsProcessData(
|
||||
PSDevice pDevice
|
||||
);
|
||||
int INTnsProcessData(PSDevice pDevice);
|
||||
|
||||
#endif /* __INT_H__ */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
|||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -878,7 +878,7 @@ void vRunCommand(void *hDeviceContext)
|
|||
// CARDbRadioPowerOff(pDevice);
|
||||
//2008-09-09<Add> BY Mike:Hot Key for Radio On/Off
|
||||
{
|
||||
NTSTATUS ntStatus = STATUS_SUCCESS;
|
||||
int ntStatus = STATUS_SUCCESS;
|
||||
BYTE byTmp;
|
||||
|
||||
ntStatus = CONTROLnsRequestIn(pDevice,
|
||||
|
|
Loading…
Reference in a new issue