[PATCH 165/641] Staging: hv: remove PVOID typedef
Greg Kroah-Hartman
gregkh at suse.de
Tue Sep 15 19:06:36 UTC 2009
The PVOID typedef is now removed from the Hyper-V driver code.
Cc: Hank Janssen <hjanssen at microsoft.com>
Cc: Haiyang Zhang <haiyangz at microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/hv/Channel.c | 20 ++++++++++----------
drivers/staging/hv/Channel.h | 16 ++++++++--------
drivers/staging/hv/ChannelInterface.c | 16 ++++++++--------
drivers/staging/hv/ChannelMgmt.c | 8 ++++----
drivers/staging/hv/ChannelMgmt.h | 4 ++--
drivers/staging/hv/Connection.c | 6 +++---
drivers/staging/hv/Hv.c | 2 +-
drivers/staging/hv/Hv.h | 2 +-
drivers/staging/hv/NetVsc.c | 8 ++++----
drivers/staging/hv/NetVsc.h | 4 ++--
drivers/staging/hv/RingBuffer.c | 18 +++++++++---------
drivers/staging/hv/RingBuffer.h | 8 ++++----
drivers/staging/hv/StorVsc.c | 6 +++---
drivers/staging/hv/VmbusPrivate.h | 2 +-
drivers/staging/hv/include/NetVscApi.h | 8 ++++----
drivers/staging/hv/include/StorVscApi.h | 4 ++--
drivers/staging/hv/include/VmbusApi.h | 18 +++++++++---------
drivers/staging/hv/include/VmbusPacketFormat.h | 2 +-
drivers/staging/hv/include/osd.h | 5 ++---
drivers/staging/hv/include/rndis.h | 4 ++--
drivers/staging/hv/osd.c | 4 ++--
21 files changed, 82 insertions(+), 83 deletions(-)
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 45b8c1b..e3dba14 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -32,7 +32,7 @@
//
static int
VmbusChannelCreateGpadlHeader(
- PVOID Kbuffer, // must be phys and virt contiguous
+ void * Kbuffer, // must be phys and virt contiguous
UINT32 Size, // page-size multiple
VMBUS_CHANNEL_MSGINFO **msgInfo,
UINT32 *MessageCount
@@ -204,10 +204,10 @@ VmbusChannelOpen(
VMBUS_CHANNEL *NewChannel,
UINT32 SendRingBufferSize,
UINT32 RecvRingBufferSize,
- PVOID UserData,
+ void * UserData,
UINT32 UserDataLen,
PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
- PVOID Context
+ void * Context
)
{
int ret=0;
@@ -392,7 +392,7 @@ Description:
--*/
static int
VmbusChannelCreateGpadlHeader(
- PVOID Kbuffer, // from kmalloc()
+ void * Kbuffer, // from kmalloc()
UINT32 Size, // page-size multiple
VMBUS_CHANNEL_MSGINFO **MsgInfo,
UINT32 *MessageCount)
@@ -515,7 +515,7 @@ Description:
int
VmbusChannelEstablishGpadl(
VMBUS_CHANNEL *Channel,
- PVOID Kbuffer, // from kmalloc()
+ void * Kbuffer, // from kmalloc()
UINT32 Size, // page-size multiple
UINT32 *GpadlHandle
)
@@ -752,7 +752,7 @@ Description:
int
VmbusChannelSendPacket(
VMBUS_CHANNEL *Channel,
- const PVOID Buffer,
+ const void * Buffer,
UINT32 BufferLen,
UINT64 RequestId,
VMBUS_PACKET_TYPE Type,
@@ -820,7 +820,7 @@ VmbusChannelSendPacketPageBuffer(
VMBUS_CHANNEL *Channel,
PAGE_BUFFER PageBuffers[],
UINT32 PageCount,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
)
@@ -902,7 +902,7 @@ int
VmbusChannelSendPacketMultiPageBuffer(
VMBUS_CHANNEL *Channel,
MULTIPAGE_BUFFER *MultiPageBuffer,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
)
@@ -984,7 +984,7 @@ Description:
int
VmbusChannelRecvPacket(
VMBUS_CHANNEL *Channel,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
@@ -1061,7 +1061,7 @@ Description:
int
VmbusChannelRecvPacketRaw(
VMBUS_CHANNEL *Channel,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 00433e1..f511ca8 100644
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -67,10 +67,10 @@ VmbusChannelOpen(
VMBUS_CHANNEL *Channel,
UINT32 SendRingBufferSize,
UINT32 RecvRingBufferSize,
- PVOID UserData,
+ void * UserData,
UINT32 UserDataLen,
PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
- PVOID Context
+ void * Context
);
static void
@@ -81,7 +81,7 @@ VmbusChannelClose(
static int
VmbusChannelSendPacket(
VMBUS_CHANNEL *Channel,
- const PVOID Buffer,
+ const void * Buffer,
UINT32 BufferLen,
UINT64 RequestId,
VMBUS_PACKET_TYPE Type,
@@ -93,7 +93,7 @@ VmbusChannelSendPacketPageBuffer(
VMBUS_CHANNEL *Channel,
PAGE_BUFFER PageBuffers[],
UINT32 PageCount,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
);
@@ -102,7 +102,7 @@ static int
VmbusChannelSendPacketMultiPageBuffer(
VMBUS_CHANNEL *Channel,
MULTIPAGE_BUFFER *MultiPageBuffer,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
);
@@ -110,7 +110,7 @@ VmbusChannelSendPacketMultiPageBuffer(
static int
VmbusChannelEstablishGpadl(
VMBUS_CHANNEL *Channel,
- PVOID Kbuffer, // from kmalloc()
+ void * Kbuffer, // from kmalloc()
UINT32 Size, // page-size multiple
UINT32 *GpadlHandle
);
@@ -124,7 +124,7 @@ VmbusChannelTeardownGpadl(
static int
VmbusChannelRecvPacket(
VMBUS_CHANNEL *Channel,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
@@ -133,7 +133,7 @@ VmbusChannelRecvPacket(
static int
VmbusChannelRecvPacketRaw(
VMBUS_CHANNEL *Channel,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c
index 94b8245..61f8334 100644
--- a/drivers/staging/hv/ChannelInterface.c
+++ b/drivers/staging/hv/ChannelInterface.c
@@ -28,10 +28,10 @@ IVmbusChannelOpen(
PDEVICE_OBJECT Device,
UINT32 SendBufferSize,
UINT32 RecvRingBufferSize,
- PVOID UserData,
+ void * UserData,
UINT32 UserDataLen,
VMBUS_CHANNEL_CALLBACK ChannelCallback,
- PVOID Context
+ void * Context
)
{
return VmbusChannelOpen( (VMBUS_CHANNEL*)Device->context,
@@ -56,7 +56,7 @@ IVmbusChannelClose(
static int
IVmbusChannelSendPacket(
PDEVICE_OBJECT Device,
- const PVOID Buffer,
+ const void * Buffer,
UINT32 BufferLen,
UINT64 RequestId,
UINT32 Type,
@@ -76,7 +76,7 @@ IVmbusChannelSendPacketPageBuffer(
PDEVICE_OBJECT Device,
PAGE_BUFFER PageBuffers[],
UINT32 PageCount,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
)
@@ -93,7 +93,7 @@ static int
IVmbusChannelSendPacketMultiPageBuffer(
PDEVICE_OBJECT Device,
MULTIPAGE_BUFFER *MultiPageBuffer,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
)
@@ -108,7 +108,7 @@ IVmbusChannelSendPacketMultiPageBuffer(
static int
IVmbusChannelRecvPacket (
PDEVICE_OBJECT Device,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
@@ -124,7 +124,7 @@ IVmbusChannelRecvPacket (
static int
IVmbusChannelRecvPacketRaw(
PDEVICE_OBJECT Device,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
@@ -140,7 +140,7 @@ IVmbusChannelRecvPacketRaw(
static int
IVmbusChannelEstablishGpadl(
PDEVICE_OBJECT Device,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* GpadlHandle
)
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c
index 59c772f..73d47ba 100644
--- a/drivers/staging/hv/ChannelMgmt.c
+++ b/drivers/staging/hv/ChannelMgmt.c
@@ -82,12 +82,12 @@ VmbusChannelOnVersionResponse(
static void
VmbusChannelProcessOffer(
- PVOID context
+ void * context
);
static void
VmbusChannelProcessRescindOffer(
- PVOID context
+ void * context
);
@@ -233,7 +233,7 @@ Description:
--*/
static void
VmbusChannelProcessOffer(
- PVOID context
+ void * context
)
{
int ret=0;
@@ -317,7 +317,7 @@ Description:
--*/
static void
VmbusChannelProcessRescindOffer(
- PVOID context
+ void * context
)
{
VMBUS_CHANNEL* channel=(VMBUS_CHANNEL*)context;
diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index dde3e69..6d2805e 100644
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/drivers/staging/hv/ChannelMgmt.h
@@ -34,7 +34,7 @@
-typedef void (*PFN_CHANNEL_CALLBACK)(PVOID context);
+typedef void (*PFN_CHANNEL_CALLBACK)(void * context);
typedef enum {
CHANNEL_OFFER_STATE,
@@ -70,7 +70,7 @@ typedef struct _VMBUS_CHANNEL {
//HANDLE dataWorkQueue;
PFN_CHANNEL_CALLBACK OnChannelCallback;
- PVOID ChannelCallbackContext;
+ void * ChannelCallbackContext;
} VMBUS_CHANNEL;
diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c
index c60ff8e..1394990 100644
--- a/drivers/staging/hv/Connection.c
+++ b/drivers/staging/hv/Connection.c
@@ -103,7 +103,7 @@ VmbusConnect(
msg->VMBusVersionRequested = VMBUS_REVISION_NUMBER;
msg->InterruptPage = GetPhysicalAddress(gVmbusConnection.InterruptPage);
msg->MonitorPage1 = GetPhysicalAddress(gVmbusConnection.MonitorPages);
- msg->MonitorPage2 = GetPhysicalAddress((PVOID)((ULONG_PTR)gVmbusConnection.MonitorPages + PAGE_SIZE));
+ msg->MonitorPage2 = GetPhysicalAddress((void *)((ULONG_PTR)gVmbusConnection.MonitorPages + PAGE_SIZE));
// Add to list before we send the request since we may receive the response
// before returning from this routine
@@ -290,7 +290,7 @@ Description:
--*/
static void
VmbusProcessChannelEvent(
- PVOID context
+ void * context
)
{
VMBUS_CHANNEL* channel;
@@ -385,7 +385,7 @@ Description:
--*/
int
VmbusPostMessage(
- PVOID buffer,
+ void * buffer,
SIZE_T bufferLen
)
{
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
index 4f080f0..801693d 100644
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -396,7 +396,7 @@ HV_STATUS
HvPostMessage(
HV_CONNECTION_ID connectionId,
HV_MESSAGE_TYPE messageType,
- PVOID payload,
+ void * payload,
SIZE_T payloadSize
)
{
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index a842e18..d5a327b 100644
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -162,7 +162,7 @@ static HV_STATUS
HvPostMessage(
HV_CONNECTION_ID connectionId,
HV_MESSAGE_TYPE messageType,
- PVOID payload,
+ void * payload,
SIZE_T payloadSize
);
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index f9a3d18..72cc7e3 100644
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -59,7 +59,7 @@ NetVscOnCleanup(
static void
NetVscOnChannelCallback(
- PVOID context
+ void * context
);
static int
@@ -107,7 +107,7 @@ NetVscOnReceive(
static void
NetVscOnReceiveCompletion(
- PVOID Context
+ void * Context
);
static void
@@ -1337,7 +1337,7 @@ retry_send_cmplt:
//
static void
NetVscOnReceiveCompletion(
- PVOID Context)
+ void * Context)
{
NETVSC_PACKET *packet = (NETVSC_PACKET*)Context;
DEVICE_OBJECT *device = (DEVICE_OBJECT*)packet->Device;
@@ -1393,7 +1393,7 @@ NetVscOnReceiveCompletion(
void
NetVscOnChannelCallback(
- PVOID Context
+ void * Context
)
{
const int netPacketSize=2048;
diff --git a/drivers/staging/hv/NetVsc.h b/drivers/staging/hv/NetVsc.h
index e92cfc1..2371b85 100644
--- a/drivers/staging/hv/NetVsc.h
+++ b/drivers/staging/hv/NetVsc.h
@@ -65,13 +65,13 @@ typedef struct _NETVSC_DEVICE {
HANDLE ReceivePacketListLock;
// Send buffer allocated by us but manages by NetVSP
- PVOID SendBuffer;
+ void * SendBuffer;
UINT32 SendBufferSize;
UINT32 SendBufferGpadlHandle;
UINT32 SendSectionSize;
// Receive buffer allocated by us but manages by NetVSP
- PVOID ReceiveBuffer;
+ void * ReceiveBuffer;
UINT32 ReceiveBufferSize;
UINT32 ReceiveBufferGpadlHandle;
UINT32 ReceiveSectionCount;
diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c
index 31db6f9..cdfd45a 100644
--- a/drivers/staging/hv/RingBuffer.c
+++ b/drivers/staging/hv/RingBuffer.c
@@ -156,10 +156,10 @@ Description:
Get the start of the ring buffer
--*/
-static inline PVOID
+static inline void *
GetRingBuffer(RING_BUFFER_INFO* RingInfo)
{
- return (PVOID)RingInfo->RingBuffer->Buffer;
+ return (void *)RingInfo->RingBuffer->Buffer;
}
@@ -228,13 +228,13 @@ static UINT32
CopyToRingBuffer(
RING_BUFFER_INFO *RingInfo,
UINT32 StartWriteOffset,
- PVOID Src,
+ void * Src,
UINT32 SrcLen);
static UINT32
CopyFromRingBuffer(
RING_BUFFER_INFO *RingInfo,
- PVOID Dest,
+ void * Dest,
UINT32 DestLen,
UINT32 StartReadOffset);
@@ -486,7 +486,7 @@ Description:
int
RingBufferRead(
RING_BUFFER_INFO* InRingInfo,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32 Offset
)
@@ -557,10 +557,10 @@ UINT32
CopyToRingBuffer(
RING_BUFFER_INFO *RingInfo,
UINT32 StartWriteOffset,
- PVOID Src,
+ void * Src,
UINT32 SrcLen)
{
- PVOID ringBuffer=GetRingBuffer(RingInfo);
+ void * ringBuffer=GetRingBuffer(RingInfo);
UINT32 ringBufferSize=GetRingBufferSize(RingInfo);
UINT32 fragLen;
@@ -597,11 +597,11 @@ Description:
UINT32
CopyFromRingBuffer(
RING_BUFFER_INFO *RingInfo,
- PVOID Dest,
+ void * Dest,
UINT32 DestLen,
UINT32 StartReadOffset)
{
- PVOID ringBuffer=GetRingBuffer(RingInfo);
+ void * ringBuffer=GetRingBuffer(RingInfo);
UINT32 ringBufferSize=GetRingBufferSize(RingInfo);
UINT32 fragLen;
diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h
index fb2dce1..f62f3d7 100644
--- a/drivers/staging/hv/RingBuffer.h
+++ b/drivers/staging/hv/RingBuffer.h
@@ -28,7 +28,7 @@
#include "include/osd.h"
typedef struct _SG_BUFFER_LIST {
- PVOID Data;
+ void * Data;
UINT32 Length;
} SG_BUFFER_LIST;
@@ -72,7 +72,7 @@ typedef struct _RING_BUFFER_DEBUG_INFO {
static int
RingBufferInit(
RING_BUFFER_INFO *RingInfo,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen
);
@@ -91,14 +91,14 @@ RingBufferWrite(
static int
RingBufferPeek(
RING_BUFFER_INFO *RingInfo,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen
);
static int
RingBufferRead(
RING_BUFFER_INFO *RingInfo,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32 Offset
);
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index c8279b7..d71fab2 100644
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -118,7 +118,7 @@ StorVscOnCleanup(
static void
StorVscOnChannelCallback(
- PVOID Context
+ void * Context
);
static void
@@ -530,7 +530,7 @@ StorVscConnectToVsp(
ret = Device->Driver->VmbusChannelInterface.Open(Device,
storDriver->RingBufferSize,
storDriver->RingBufferSize,
- (PVOID)&props,
+ (void *)&props,
sizeof(VMSTORAGE_CHANNEL_PROPERTIES),
StorVscOnChannelCallback,
Device
@@ -901,7 +901,7 @@ StorVscOnReceive(
void
StorVscOnChannelCallback(
- PVOID Context
+ void * Context
)
{
int ret=0;
diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
index 9ce0c5b..1b2a1dc 100644
--- a/drivers/staging/hv/VmbusPrivate.h
+++ b/drivers/staging/hv/VmbusPrivate.h
@@ -148,7 +148,7 @@ VmbusDisconnect(
static int
VmbusPostMessage(
- PVOID buffer,
+ void * buffer,
SIZE_T bufSize
);
diff --git a/drivers/staging/hv/include/NetVscApi.h b/drivers/staging/hv/include/NetVscApi.h
index 8e780b0..8d7bddf 100644
--- a/drivers/staging/hv/include/NetVscApi.h
+++ b/drivers/staging/hv/include/NetVscApi.h
@@ -49,7 +49,7 @@ typedef int (*PFN_ON_CLOSE)(DEVICE_OBJECT *Device);
typedef void (*PFN_QUERY_LINKSTATUS)(DEVICE_OBJECT *Device);
typedef int (*PFN_ON_SEND)(DEVICE_OBJECT *dev, PNETVSC_PACKET packet);
-typedef void (*PFN_ON_SENDRECVCOMPLETION)(PVOID Context);
+typedef void (*PFN_ON_SENDRECVCOMPLETION)(void * Context);
typedef int (*PFN_ON_RECVCALLBACK)(DEVICE_OBJECT *dev, PNETVSC_PACKET packet);
typedef void (*PFN_ON_LINKSTATUS_CHANGED)(DEVICE_OBJECT *dev, UINT32 Status);
@@ -80,18 +80,18 @@ typedef struct _NETVSC_PACKET {
union {
struct{
UINT64 ReceiveCompletionTid;
- PVOID ReceiveCompletionContext;
+ void * ReceiveCompletionContext;
PFN_ON_SENDRECVCOMPLETION OnReceiveCompletion;
} Recv;
struct{
UINT64 SendCompletionTid;
- PVOID SendCompletionContext;
+ void * SendCompletionContext;
PFN_ON_SENDRECVCOMPLETION OnSendCompletion;
} Send;
} Completion;
// This points to the memory after PageBuffers
- PVOID Extension;
+ void * Extension;
UINT32 TotalDataBufferLength;
// Points to the send/receive buffer where the ethernet frame is
diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h
index 492a1d2..95e9c55 100644
--- a/drivers/staging/hv/include/StorVscApi.h
+++ b/drivers/staging/hv/include/StorVscApi.h
@@ -83,12 +83,12 @@ typedef struct _STORVSC_REQUEST {
UCHAR* SenseBuffer;
UINT32 SenseBufferSize;
- PVOID Context;
+ void * Context;
PFN_ON_IO_REQUEST_COMPLTN OnIOCompletion;
// This points to the memory after DataBuffer
- PVOID Extension;
+ void * Extension;
MULTIPAGE_BUFFER DataBuffer;
} STORVSC_REQUEST;
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index 4992c91..adcfbdf 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -88,16 +88,16 @@ typedef int (*PFN_ON_CHILDDEVICE_ADD)(PDEVICE_OBJECT RootDevice, PDEVICE_OBJECT
typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(PDEVICE_OBJECT Device);
// Vmbus channel interface
-typedef void (*VMBUS_CHANNEL_CALLBACK)(PVOID context);
+typedef void (*VMBUS_CHANNEL_CALLBACK)(void * context);
typedef int (*VMBUS_CHANNEL_OPEN)(
PDEVICE_OBJECT Device,
UINT32 SendBufferSize,
UINT32 RecvRingBufferSize,
- PVOID UserData,
+ void * UserData,
UINT32 UserDataLen,
VMBUS_CHANNEL_CALLBACK ChannelCallback,
- PVOID Context
+ void * Context
);
typedef void (*VMBUS_CHANNEL_CLOSE)(
@@ -106,7 +106,7 @@ typedef void (*VMBUS_CHANNEL_CLOSE)(
typedef int (*VMBUS_CHANNEL_SEND_PACKET)(
PDEVICE_OBJECT Device,
- const PVOID Buffer,
+ const void * Buffer,
UINT32 BufferLen,
UINT64 RequestId,
UINT32 Type,
@@ -117,7 +117,7 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET_PAGEBUFFER)(
PDEVICE_OBJECT Device,
PAGE_BUFFER PageBuffers[],
UINT32 PageCount,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
);
@@ -125,14 +125,14 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET_PAGEBUFFER)(
typedef int (*VMBUS_CHANNEL_SEND_PACKET_MULTIPAGEBUFFER)(
PDEVICE_OBJECT Device,
MULTIPAGE_BUFFER *MultiPageBuffer,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT64 RequestId
);
typedef int (*VMBUS_CHANNEL_RECV_PACKET)(
PDEVICE_OBJECT Device,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
@@ -140,7 +140,7 @@ typedef int (*VMBUS_CHANNEL_RECV_PACKET)(
typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)(
PDEVICE_OBJECT Device,
- PVOID Buffer,
+ void * Buffer,
UINT32 BufferLen,
UINT32* BufferActualLen,
UINT64* RequestId
@@ -148,7 +148,7 @@ typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)(
typedef int (*VMBUS_CHANNEL_ESTABLISH_GPADL)(
PDEVICE_OBJECT Device,
- PVOID Buffer, // from kmalloc()
+ void * Buffer, // from kmalloc()
UINT32 BufferLen, // page-size multiple
UINT32* GpadlHandle
);
diff --git a/drivers/staging/hv/include/VmbusPacketFormat.h b/drivers/staging/hv/include/VmbusPacketFormat.h
index bb0c927..372d9c0 100644
--- a/drivers/staging/hv/include/VmbusPacketFormat.h
+++ b/drivers/staging/hv/include/VmbusPacketFormat.h
@@ -287,7 +287,7 @@ typedef union {
} VMPACKET_LARGEST_POSSIBLE_HEADER, *PVMPACKET_LARGEST_POSSIBLE_HEADER;
#define VMPACKET_DATA_START_ADDRESS(__packet) \
- (PVOID)(((PUCHAR)__packet) + ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8 * 8)
+ (void *)(((PUCHAR)__packet) + ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8 * 8)
#define VMPACKET_DATA_LENGTH(__packet) \
((((PVMPACKET_DESCRIPTOR)__packet)->Length8 - ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8) * 8)
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index 50f5e39..53a52cd 100644
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -133,7 +133,6 @@ typedef long long LONGLONG;
typedef unsigned long SIZE_T;
typedef void VOID;
//typedef unsigned char GUID[16];
-typedef void* PVOID;
typedef unsigned char BOOL;
typedef unsigned char BOOLEAN;
typedef void* HANDLE;
@@ -246,9 +245,9 @@ extern void SpinlockRelease(HANDLE hSpin);
void* Physical2LogicalAddr(ULONG_PTR PhysAddr);
#define GetPhysicalAddress Logical2PhysicalAddr
-ULONG_PTR Logical2PhysicalAddr(PVOID LogicalAddr);
+ULONG_PTR Logical2PhysicalAddr(void * LogicalAddr);
-ULONG_PTR Virtual2Physical(PVOID VirtAddr);
+ULONG_PTR Virtual2Physical(void * VirtAddr);
void* PageMapVirtualAddress(unsigned long Pfn);
void PageUnmapVirtualAddress(void* VirtAddr);
diff --git a/drivers/staging/hv/include/rndis.h b/drivers/staging/hv/include/rndis.h
index 7ea27b4..803e923 100644
--- a/drivers/staging/hv/include/rndis.h
+++ b/drivers/staging/hv/include/rndis.h
@@ -827,10 +827,10 @@ typedef __struct_bcount(MessageLength) struct _RNDIS_MESSAGE
// get pointer to contained message from NDIS_MESSAGE pointer
#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(RndisMessage) \
- ((PVOID) &RndisMessage->Message)
+ ((void *) &RndisMessage->Message)
// get pointer to contained message from NDIS_MESSAGE pointer
#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR(RndisMessage) \
- ((PVOID) RndisMessage)
+ ((void *) RndisMessage)
#endif // _RNDIS_H_
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index bfb2c8e..4dda0dd 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -414,14 +414,14 @@ void* Physical2LogicalAddr(ULONG_PTR PhysAddr)
return logicalAddr;
}
-ULONG_PTR Logical2PhysicalAddr(PVOID LogicalAddr)
+ULONG_PTR Logical2PhysicalAddr(void * LogicalAddr)
{
BUG_ON(!virt_addr_valid(LogicalAddr));
return virt_to_phys(LogicalAddr);
}
-ULONG_PTR Virtual2Physical(PVOID VirtAddr)
+ULONG_PTR Virtual2Physical(void * VirtAddr)
{
ULONG_PTR pfn = vmalloc_to_pfn(VirtAddr);
--
1.6.4.2
More information about the devel
mailing list