From 27264fb8c74ab936fdcc0fb2ec9264bf13ba3baf Mon Sep 17 00:00:00 2001 From: Andres More Date: Thu, 5 Aug 2010 21:18:55 -0300 Subject: [PATCH] staging: vt6656: removed NDIS_STATUS int redefinition Removed int redefinition for function results. Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/device.h | 3 --- drivers/staging/vt6656/firmware.c | 4 ++-- drivers/staging/vt6656/usbpipe.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index a9a95d45a235..4cf3a711c7a4 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -258,8 +258,6 @@ typedef enum _VIA_PKT_TYPE //++ NDIS related -#define NDIS_STATUS int - typedef enum __DEVICE_NDIS_STATUS { STATUS_SUCCESS = 0, STATUS_FAILURE, @@ -267,7 +265,6 @@ typedef enum __DEVICE_NDIS_STATUS { STATUS_PENDING, } DEVICE_NDIS_STATUS, *PDEVICE_NDIS_STATUS; - #define MAX_BSSIDINFO_4_PMKID 16 #define MAX_PMKIDLIST 5 //Flags for PMKID Candidate list structure diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index ebb9c99df70c..ad06fd1398e6 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -773,7 +773,7 @@ FIRMWAREbDownload( PSDevice pDevice ) { - NDIS_STATUS NdisStatus; + int NdisStatus; PBYTE pBuffer = NULL; WORD wLength; int ii; @@ -823,7 +823,7 @@ FIRMWAREbBrach2Sram( PSDevice pDevice ) { - NDIS_STATUS NdisStatus; + int NdisStatus; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n"); diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index a32785cb9d18..bc18fb064167 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -618,7 +618,7 @@ s_nsBulkInUsbIoCompleteRead( * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver * */ -NDIS_STATUS +int PIPEnsSendBulkOut( PSDevice pDevice, PUSB_SEND_CONTEXT pContext -- 2.30.2