Staging: hv: remove VOID typedef

The VOID typedef is now removed from the Hyper-V driver code.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index e3dba14c90470f1abbe44de9451f2b5d5454b517..07fb5c7f91b7d6df587532ef7995be3f9ceba782 100644 (file)
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -677,7 +677,7 @@ Description:
        Close the specified channel
 
 --*/
-VOID
+void
 VmbusChannelClose(
        VMBUS_CHANNEL   *Channel
        )

diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c
index 73d47ba3bfea0827b662a390b4c5d7fe4359d479..9d8f4ef1e0b9428ea6ccf3ba2688124d9cf03a98 100644 (file)
--- a/drivers/staging/hv/ChannelMgmt.c
+++ b/drivers/staging/hv/ChannelMgmt.c
@@ -672,7 +672,7 @@ Description:
        This is invoked in the vmbus worker thread context.
 
 --*/
-VOID
+void
 VmbusOnChannelMessage(
        void *Context
        )
@@ -722,7 +722,7 @@ Description:
 --*/
 int
 VmbusChannelRequestOffers(
-       VOID
+       void
        )
 {
        int ret=0;
@@ -785,7 +785,7 @@ Description:
 --*/
 void
 VmbusChannelReleaseUnattachedChannels(
-       VOID
+       void
        )
 {
        LIST_ENTRY *entry;

diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index 6d2805ea4a7dd7587740bc9629b9684b06a22064..511b80fa22d6b9c9ae98d25cfa48e0e4b35afeb2 100644 (file)
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/drivers/staging/hv/ChannelMgmt.h
@@ -59,7 +59,7 @@ typedef struct _VMBUS_CHANNEL {
        UINT32                                          RingBufferGpadlHandle;
 
        // Allocated memory for ring buffer
-       VOID*                                           RingBufferPages;
+       void *                                          RingBufferPages;
        UINT32                                          RingBufferPageCount;
        RING_BUFFER_INFO                        Outbound;       // send to parent
        RING_BUFFER_INFO                        Inbound;        // receive from parent

diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c
index 139499040a8abc529953db36119d6d3684fdbbbc..f3e1360564b41d3c16e65650a4331693506e7505 100644 (file)
--- a/drivers/staging/hv/Connection.c
+++ b/drivers/staging/hv/Connection.c
@@ -195,7 +195,7 @@ Description:
 --*/
 int
 VmbusDisconnect(
-       VOID
+       void
        )
 {
        int ret=0;
@@ -323,9 +323,9 @@ Description:
        Handler for events
 
 --*/
-VOID
+void
 VmbusOnEvents(
-  VOID
+  void
        )
 {
        int dword;

diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
index 801693df8432dc9a18753ebd2320b835d8f7c6e1..3a37c12a59a8cd80826c4dd49ea0de5178f34728 100644 (file)
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -621,9 +621,9 @@ Description:
        Cleanup routine for HvSynicInit().
 
 --*/
-VOID
+void
 HvSynicCleanup(
-       VOID
+       void
        )
 {
     HV_SYNIC_SINT      sharedSint;

diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index d5a327b948b017094e653da059ad9bd57e954eb8..b75ad5df23ff666d8d88c57a449879725280c0dc 100644 (file)
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -150,12 +150,12 @@ static inline void WriteMsr(int msr, UINT64 val)
 //
 static int
 HvInit(
-    VOID
+    void
     );
 
-static VOID
+static void
 HvCleanup(
-    VOID
+    void
     );
 
 static HV_STATUS
@@ -168,7 +168,7 @@ HvPostMessage(
 
 static HV_STATUS
 HvSignalEvent(
-       VOID
+       void
        );
 
 static int
@@ -176,9 +176,9 @@ HvSynicInit(
        UINT32          irqVector
        );
 
-static VOID
+static void
 HvSynicCleanup(
-       VOID
+       void
        );
 
 #endif // __HV_H__

diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c
index cdfd45af93a7aa64e0dc6f96d2dd27471e71f05c..a8df47e13eb2aaae788833412c3703e76c90ee5d 100644 (file)
--- a/drivers/staging/hv/RingBuffer.c
+++ b/drivers/staging/hv/RingBuffer.c
@@ -301,7 +301,7 @@ Description:
 int
 RingBufferInit(
        RING_BUFFER_INFO        *RingInfo,
-       VOID                            *Buffer,
+       void                            *Buffer,
        UINT32                          BufferLen
        )
 {

diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index c2cac2180a4099a332b23182bf5f8e4dc32a8039..a455a89d7557a32919eb826809b29bf4822a8ae1 100644 (file)
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -120,7 +120,7 @@ static int
 RndisFilterQueryDevice(
        RNDIS_DEVICE    *Device,
        UINT32                  Oid,
-       VOID                    *Result,
+       void                    *Result,
        UINT32                  *ResultSize
        );
 
@@ -585,7 +585,7 @@ static int
 RndisFilterQueryDevice(
        RNDIS_DEVICE    *Device,
        UINT32                  Oid,
-       VOID                    *Result,
+       void                    *Result,
        UINT32                  *ResultSize
        )
 {

diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
index 1b2a1dc744812f1080c4a78736e972ad6e5619e6..1e54b2463f96258e5720b410942a660e3e6b433d 100644 (file)
--- a/drivers/staging/hv/VmbusPrivate.h
+++ b/drivers/staging/hv/VmbusPrivate.h
@@ -73,12 +73,12 @@ typedef struct _VMBUS_CONNECTION {
        // calls Hv to generate a port event. The other end
        // receives the port event and parse the recvInterruptPage
        // to see which bit is set
-       VOID*                                                           InterruptPage;
-       VOID*                                                           SendInterruptPage;
-       VOID*                                                           RecvInterruptPage;
+       void *                                                          InterruptPage;
+       void *                                                          SendInterruptPage;
+       void *                                                          RecvInterruptPage;
 
        // 2 pages - 1st page for parent->child notification and 2nd is child->parent notification
-       VOID*                                                           MonitorPages;
+       void *                                                          MonitorPages;
        LIST_ENTRY                                                      ChannelMsgList;
        HANDLE                                                          ChannelMsgLock;
 
@@ -138,12 +138,12 @@ GetChannelFromRelId(
 //
 static int
 VmbusConnect(
-       VOID
+       void
        );
 
 static int
 VmbusDisconnect(
-       VOID
+       void
        );
 
 static int
@@ -157,9 +157,9 @@ VmbusSetEvent(
        UINT32 childRelId
        );
 
-static VOID
+static void
 VmbusOnEvents(
-  VOID
+  void
        );
 
 

diff --git a/drivers/staging/hv/include/List.h b/drivers/staging/hv/include/List.h
index 117a45fcca6fa2efd976a610dce9f6a32d7f178d..6cfe7dfd66ebfef13a181eec5ec4a2fa75121fbd 100644 (file)
--- a/drivers/staging/hv/include/List.h
+++ b/drivers/staging/hv/include/List.h
@@ -44,7 +44,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  InitializeListHead(
  *      PLIST_ENTRY ListHead
  *      );
@@ -132,7 +132,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  RemoveEntryList(
  *      PLIST_ENTRY Entry
  *      );
@@ -148,7 +148,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  AttachList(
  *      PLIST_ENTRY ListHead,
  *      PLIST_ENTRY ListEntry
@@ -168,7 +168,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  InsertTailList(
  *      PLIST_ENTRY ListHead,
  *      PLIST_ENTRY Entry
@@ -188,7 +188,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  InsertHeadList(
  *      PLIST_ENTRY ListHead,
  *      PLIST_ENTRY Entry
@@ -207,7 +207,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  IterateListEntries(
  *      PLIST_ENTRY anchor,
  *      PLIST_ENTRY index,
@@ -245,7 +245,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
 
 
 /*
- *  VOID
+ *  void
  *  PushEntryList(
  *      PSINGLE_LIST_ENTRY ListHead,
  *             PSINGLE_LIST_ENTRY Entry

diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index 53a52cd9be386598028cce81b5b11b84652c2ee9..c78dd62cf5f5899069ee45af7dd2668ab6d25000 100644 (file)
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -131,7 +131,6 @@ typedef long long                   LONGLONG;
 // Other types
 //
 typedef unsigned long          SIZE_T;
-typedef void                           VOID;
 //typedef unsigned char                GUID[16];
 typedef unsigned char          BOOL;
 typedef unsigned char          BOOLEAN;
@@ -219,7 +218,7 @@ extern void* MemAlloc(unsigned int size);
 extern void* MemAllocZeroed(unsigned int size);
 extern void* MemAllocAtomic(unsigned int size);
 extern void MemFree(void* buf);
-extern void MemoryFence(VOID);
+extern void MemoryFence(void);
 
 extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context);
 extern void TimerClose(HANDLE hTimer);

diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 4dda0dd40584eec0e9fcf1bca138d104ed9193e7..cf8091308d926a7497774788c2b3dad86f829037 100644 (file)
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -375,7 +375,7 @@ int WaitEventWaitEx(HANDLE hWait, UINT32 TimeoutInMs)
        return ret;
 }
 
-HANDLE SpinlockCreate(VOID)
+HANDLE SpinlockCreate(void)
 {
        SPINLOCK* spin = kmalloc(sizeof(SPINLOCK), GFP_KERNEL);
        if (!spin)
@@ -387,21 +387,21 @@ HANDLE SpinlockCreate(VOID)
        return spin;
 }
 
-VOID SpinlockAcquire(HANDLE hSpin)
+void SpinlockAcquire(HANDLE hSpin)
 {
        SPINLOCK* spin = (SPINLOCK* )hSpin;
 
        spin_lock_irqsave(&spin->lock, spin->flags);
 }
 
-VOID SpinlockRelease(HANDLE hSpin)
+void SpinlockRelease(HANDLE hSpin)
 {
        SPINLOCK* spin = (SPINLOCK* )hSpin;
 
        spin_unlock_irqrestore(&spin->lock, spin->flags);
 }
 
-VOID SpinlockClose(HANDLE hSpin)
+void SpinlockClose(HANDLE hSpin)
 {
        SPINLOCK* spin = (SPINLOCK* )hSpin;
        kfree(spin);