Commit e20f683b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8282c400
...@@ -677,7 +677,7 @@ VmbusChannelTeardownGpadl( ...@@ -677,7 +677,7 @@ VmbusChannelTeardownGpadl(
Close the specified channel Close the specified channel
--*/ --*/
VOID void
VmbusChannelClose( VmbusChannelClose(
VMBUS_CHANNEL *Channel VMBUS_CHANNEL *Channel
) )
......
...@@ -672,7 +672,7 @@ VmbusChannelOnVersionResponse( ...@@ -672,7 +672,7 @@ VmbusChannelOnVersionResponse(
This is invoked in the vmbus worker thread context. This is invoked in the vmbus worker thread context.
--*/ --*/
VOID void
VmbusOnChannelMessage( VmbusOnChannelMessage(
void *Context void *Context
) )
...@@ -722,7 +722,7 @@ VmbusOnChannelMessage( ...@@ -722,7 +722,7 @@ VmbusOnChannelMessage(
--*/ --*/
int int
VmbusChannelRequestOffers( VmbusChannelRequestOffers(
VOID void
) )
{ {
int ret=0; int ret=0;
...@@ -785,7 +785,7 @@ VmbusChannelRequestOffers( ...@@ -785,7 +785,7 @@ VmbusChannelRequestOffers(
--*/ --*/
void void
VmbusChannelReleaseUnattachedChannels( VmbusChannelReleaseUnattachedChannels(
VOID void
) )
{ {
LIST_ENTRY *entry; LIST_ENTRY *entry;
......
...@@ -59,7 +59,7 @@ typedef struct _VMBUS_CHANNEL { ...@@ -59,7 +59,7 @@ typedef struct _VMBUS_CHANNEL {
UINT32 RingBufferGpadlHandle; UINT32 RingBufferGpadlHandle;
// Allocated memory for ring buffer // Allocated memory for ring buffer
VOID* RingBufferPages; void * RingBufferPages;
UINT32 RingBufferPageCount; UINT32 RingBufferPageCount;
RING_BUFFER_INFO Outbound; // send to parent RING_BUFFER_INFO Outbound; // send to parent
RING_BUFFER_INFO Inbound; // receive from parent RING_BUFFER_INFO Inbound; // receive from parent
......
...@@ -195,7 +195,7 @@ VmbusConnect( ...@@ -195,7 +195,7 @@ VmbusConnect(
--*/ --*/
int int
VmbusDisconnect( VmbusDisconnect(
VOID void
) )
{ {
int ret=0; int ret=0;
...@@ -323,9 +323,9 @@ VmbusProcessChannelEvent( ...@@ -323,9 +323,9 @@ VmbusProcessChannelEvent(
Handler for events Handler for events
--*/ --*/
VOID void
VmbusOnEvents( VmbusOnEvents(
VOID void
) )
{ {
int dword; int dword;
......
...@@ -621,9 +621,9 @@ HvSynicInit ( ...@@ -621,9 +621,9 @@ HvSynicInit (
Cleanup routine for HvSynicInit(). Cleanup routine for HvSynicInit().
--*/ --*/
VOID void
HvSynicCleanup( HvSynicCleanup(
VOID void
) )
{ {
HV_SYNIC_SINT sharedSint; HV_SYNIC_SINT sharedSint;
......
...@@ -150,12 +150,12 @@ static inline void WriteMsr(int msr, UINT64 val) ...@@ -150,12 +150,12 @@ static inline void WriteMsr(int msr, UINT64 val)
// //
static int static int
HvInit( HvInit(
VOID void
); );
static VOID static void
HvCleanup( HvCleanup(
VOID void
); );
static HV_STATUS static HV_STATUS
...@@ -168,7 +168,7 @@ HvPostMessage( ...@@ -168,7 +168,7 @@ HvPostMessage(
static HV_STATUS static HV_STATUS
HvSignalEvent( HvSignalEvent(
VOID void
); );
static int static int
...@@ -176,9 +176,9 @@ HvSynicInit( ...@@ -176,9 +176,9 @@ HvSynicInit(
UINT32 irqVector UINT32 irqVector
); );
static VOID static void
HvSynicCleanup( HvSynicCleanup(
VOID void
); );
#endif // __HV_H__ #endif // __HV_H__
...@@ -301,7 +301,7 @@ GetRingBufferInterruptMask( ...@@ -301,7 +301,7 @@ GetRingBufferInterruptMask(
int int
RingBufferInit( RingBufferInit(
RING_BUFFER_INFO *RingInfo, RING_BUFFER_INFO *RingInfo,
VOID *Buffer, void *Buffer,
UINT32 BufferLen UINT32 BufferLen
) )
{ {
......
...@@ -120,7 +120,7 @@ static int ...@@ -120,7 +120,7 @@ static int
RndisFilterQueryDevice( RndisFilterQueryDevice(
RNDIS_DEVICE *Device, RNDIS_DEVICE *Device,
UINT32 Oid, UINT32 Oid,
VOID *Result, void *Result,
UINT32 *ResultSize UINT32 *ResultSize
); );
...@@ -585,7 +585,7 @@ static int ...@@ -585,7 +585,7 @@ static int
RndisFilterQueryDevice( RndisFilterQueryDevice(
RNDIS_DEVICE *Device, RNDIS_DEVICE *Device,
UINT32 Oid, UINT32 Oid,
VOID *Result, void *Result,
UINT32 *ResultSize UINT32 *ResultSize
) )
{ {
......
...@@ -73,12 +73,12 @@ typedef struct _VMBUS_CONNECTION { ...@@ -73,12 +73,12 @@ typedef struct _VMBUS_CONNECTION {
// calls Hv to generate a port event. The other end // calls Hv to generate a port event. The other end
// receives the port event and parse the recvInterruptPage // receives the port event and parse the recvInterruptPage
// to see which bit is set // to see which bit is set
VOID* InterruptPage; void * InterruptPage;
VOID* SendInterruptPage; void * SendInterruptPage;
VOID* RecvInterruptPage; void * RecvInterruptPage;
// 2 pages - 1st page for parent->child notification and 2nd is child->parent notification // 2 pages - 1st page for parent->child notification and 2nd is child->parent notification
VOID* MonitorPages; void * MonitorPages;
LIST_ENTRY ChannelMsgList; LIST_ENTRY ChannelMsgList;
HANDLE ChannelMsgLock; HANDLE ChannelMsgLock;
...@@ -138,12 +138,12 @@ GetChannelFromRelId( ...@@ -138,12 +138,12 @@ GetChannelFromRelId(
// //
static int static int
VmbusConnect( VmbusConnect(
VOID void
); );
static int static int
VmbusDisconnect( VmbusDisconnect(
VOID void
); );
static int static int
...@@ -157,9 +157,9 @@ VmbusSetEvent( ...@@ -157,9 +157,9 @@ VmbusSetEvent(
UINT32 childRelId UINT32 childRelId
); );
static VOID static void
VmbusOnEvents( VmbusOnEvents(
VOID void
); );
......
...@@ -44,7 +44,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -44,7 +44,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* InitializeListHead( * InitializeListHead(
* PLIST_ENTRY ListHead * PLIST_ENTRY ListHead
* ); * );
...@@ -132,7 +132,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -132,7 +132,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* RemoveEntryList( * RemoveEntryList(
* PLIST_ENTRY Entry * PLIST_ENTRY Entry
* ); * );
...@@ -148,7 +148,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -148,7 +148,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* AttachList( * AttachList(
* PLIST_ENTRY ListHead, * PLIST_ENTRY ListHead,
* PLIST_ENTRY ListEntry * PLIST_ENTRY ListEntry
...@@ -168,7 +168,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -168,7 +168,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* InsertTailList( * InsertTailList(
* PLIST_ENTRY ListHead, * PLIST_ENTRY ListHead,
* PLIST_ENTRY Entry * PLIST_ENTRY Entry
...@@ -188,7 +188,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -188,7 +188,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* InsertHeadList( * InsertHeadList(
* PLIST_ENTRY ListHead, * PLIST_ENTRY ListHead,
* PLIST_ENTRY Entry * PLIST_ENTRY Entry
...@@ -207,7 +207,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -207,7 +207,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* IterateListEntries( * IterateListEntries(
* PLIST_ENTRY anchor, * PLIST_ENTRY anchor,
* PLIST_ENTRY index, * PLIST_ENTRY index,
...@@ -245,7 +245,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY; ...@@ -245,7 +245,7 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
/* /*
* VOID * void
* PushEntryList( * PushEntryList(
* PSINGLE_LIST_ENTRY ListHead, * PSINGLE_LIST_ENTRY ListHead,
* PSINGLE_LIST_ENTRY Entry * PSINGLE_LIST_ENTRY Entry
......
...@@ -131,7 +131,6 @@ typedef long long LONGLONG; ...@@ -131,7 +131,6 @@ typedef long long LONGLONG;
// Other types // Other types
// //
typedef unsigned long SIZE_T; typedef unsigned long SIZE_T;
typedef void VOID;
//typedef unsigned char GUID[16]; //typedef unsigned char GUID[16];
typedef unsigned char BOOL; typedef unsigned char BOOL;
typedef unsigned char BOOLEAN; typedef unsigned char BOOLEAN;
...@@ -219,7 +218,7 @@ extern void* MemAlloc(unsigned int size); ...@@ -219,7 +218,7 @@ extern void* MemAlloc(unsigned int size);
extern void* MemAllocZeroed(unsigned int size); extern void* MemAllocZeroed(unsigned int size);
extern void* MemAllocAtomic(unsigned int size); extern void* MemAllocAtomic(unsigned int size);
extern void MemFree(void* buf); extern void MemFree(void* buf);
extern void MemoryFence(VOID); extern void MemoryFence(void);
extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context); extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context);
extern void TimerClose(HANDLE hTimer); extern void TimerClose(HANDLE hTimer);
......
...@@ -375,7 +375,7 @@ int WaitEventWaitEx(HANDLE hWait, UINT32 TimeoutInMs) ...@@ -375,7 +375,7 @@ int WaitEventWaitEx(HANDLE hWait, UINT32 TimeoutInMs)
return ret; return ret;
} }
HANDLE SpinlockCreate(VOID) HANDLE SpinlockCreate(void)
{ {
SPINLOCK* spin = kmalloc(sizeof(SPINLOCK), GFP_KERNEL); SPINLOCK* spin = kmalloc(sizeof(SPINLOCK), GFP_KERNEL);
if (!spin) if (!spin)
...@@ -387,21 +387,21 @@ HANDLE SpinlockCreate(VOID) ...@@ -387,21 +387,21 @@ HANDLE SpinlockCreate(VOID)
return spin; return spin;
} }
VOID SpinlockAcquire(HANDLE hSpin) void SpinlockAcquire(HANDLE hSpin)
{ {
SPINLOCK* spin = (SPINLOCK* )hSpin; SPINLOCK* spin = (SPINLOCK* )hSpin;
spin_lock_irqsave(&spin->lock, spin->flags); spin_lock_irqsave(&spin->lock, spin->flags);
} }
VOID SpinlockRelease(HANDLE hSpin) void SpinlockRelease(HANDLE hSpin)
{ {
SPINLOCK* spin = (SPINLOCK* )hSpin; SPINLOCK* spin = (SPINLOCK* )hSpin;
spin_unlock_irqrestore(&spin->lock, spin->flags); spin_unlock_irqrestore(&spin->lock, spin->flags);
} }
VOID SpinlockClose(HANDLE hSpin) void SpinlockClose(HANDLE hSpin)
{ {
SPINLOCK* spin = (SPINLOCK* )hSpin; SPINLOCK* spin = (SPINLOCK* )hSpin;
kfree(spin); kfree(spin);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment