staging: vt6656: removed NDIS_STATUS int redefinition
authorAndres More <more.andres@gmail.com>
Fri, 6 Aug 2010 00:18:55 +0000 (21:18 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Aug 2010 18:31:26 +0000 (11:31 -0700)
Removed int redefinition for function results.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6656/device.h
drivers/staging/vt6656/firmware.c
drivers/staging/vt6656/usbpipe.c

index a9a95d45a235030fd7fcfe9c14ad0239e1c4fd42..4cf3a711c7a43d9cdedc84e48613f0b70643b459 100644 (file)
@@ -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
index ebb9c99df70c91503db373de904b8f95fcb805ab..ad06fd1398e686cbf2914ce74f65d0ed29759026 100644 (file)
@@ -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");
 
index a32785cb9d18af8acc6433b3f50d2b3b41ef6756..bc18fb064167fb1a20e9ab9e356916a4afa9815b 100644 (file)
@@ -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