Commit ee3d7ddf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: typedef removal for VmbusApi.h 



The function pointers still have ugly names, but the structures
are now cleaned up.

Note, a comment was added where the driver structure is pointing
at a problem that needs to be fixed up later in the code.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 54b2b847

drivers/staging/hv/Channel.c

+3 −3
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel, 


--*/

int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel,

	PAGE_BUFFER			PageBuffers[],

	struct hv_page_buffer PageBuffers[],

	u32				PageCount,

	void *				Buffer,

	u32				BufferLen,
@@ -814,7 +814,7 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel, 
	DumpVmbusChannel(Channel);



	/* Adjust the size down since VMBUS_CHANNEL_PACKET_PAGE_BUFFER is the largest size we support */

	descSize = sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER));

	descSize = sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(struct hv_page_buffer));

	packetLen = descSize + BufferLen;

	packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
@@ -868,7 +868,7 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel, 


--*/

int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel,

	MULTIPAGE_BUFFER	*MultiPageBuffer,

	struct hv_multipage_buffer *MultiPageBuffer,

	void *				Buffer,

	u32				BufferLen,

	u64				RequestId

drivers/staging/hv/Channel.h

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER { 
	u64 TransactionId;

	u32 Reserved;

	u32 RangeCount;

	PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT];

	struct hv_page_buffer Range[MAX_PAGE_BUFFER_COUNT];

} __attribute__((packed));



/* The format must be the same as VMDATA_GPA_DIRECT */
@@ -48,7 +48,7 @@ struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { 
	u64 TransactionId;

	u32 Reserved;

	u32 RangeCount;		/* Always 1 in this case */

	MULTIPAGE_BUFFER Range;

	struct hv_multipage_buffer Range;

} __attribute__((packed));
@@ -70,14 +70,14 @@ extern int VmbusChannelSendPacket(struct vmbus_channel *channel, 
				  u32 Flags);



extern int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *channel,

					    PAGE_BUFFER PageBuffers[],

					    struct hv_page_buffer PageBuffers[],

					    u32 PageCount,

					    void *Buffer,

					    u32 BufferLen,

					    u64 RequestId);



extern int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *channel,

					MULTIPAGE_BUFFER *MultiPageBuffer,

					struct hv_multipage_buffer *mpb,

					void *Buffer,

					u32 BufferLen,

					u64 RequestId);

drivers/staging/hv/ChannelInterface.c

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ IVmbusChannelSendPacket( 
static int

IVmbusChannelSendPacketPageBuffer(

	struct hv_device *Device,

	PAGE_BUFFER			PageBuffers[],

	struct hv_page_buffer PageBuffers[],

	u32				PageCount,

	void *				Buffer,

	u32				BufferLen,
@@ -95,7 +95,7 @@ IVmbusChannelSendPacketPageBuffer( 
static int

IVmbusChannelSendPacketMultiPageBuffer(

	struct hv_device *Device,

	MULTIPAGE_BUFFER	*MultiPageBuffer,

	struct hv_multipage_buffer *MultiPageBuffer,

	void *				Buffer,

	u32				BufferLen,

	u64				RequestId
@@ -165,7 +165,7 @@ IVmbusChannelTeardownGpadl( 


}



void GetChannelInterface(VMBUS_CHANNEL_INTERFACE *ChannelInterface)

void GetChannelInterface(struct vmbus_channel_interface *ChannelInterface)

{

	ChannelInterface->Open						= IVmbusChannelOpen;

	ChannelInterface->Close						= IVmbusChannelClose;
@@ -180,7 +180,7 @@ void GetChannelInterface(VMBUS_CHANNEL_INTERFACE *ChannelInterface) 
}





void GetChannelInfo(struct hv_device *Device, DEVICE_INFO *DeviceInfo)

void GetChannelInfo(struct hv_device *Device, struct hv_device_info *DeviceInfo)

{

	struct vmbus_channel_debug_info debugInfo;

drivers/staging/hv/ChannelInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 


#include "include/VmbusApi.h"



void GetChannelInterface(VMBUS_CHANNEL_INTERFACE *ChannelInterface);

void GetChannelInterface(struct vmbus_channel_interface *ChannelInterface);



void GetChannelInfo(struct hv_device *Device, DEVICE_INFO *DeviceInfo);

void GetChannelInfo(struct hv_device *Device, struct hv_device_info *DeviceInfo);



#endif /* _CHANNEL_INTERFACE_H_ */

drivers/staging/hv/NetVsc.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ NetVscOnDeviceAdd( 


	for (i=0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++)

	{

		packet = kzalloc(sizeof(struct hv_netvsc_packet) + (NETVSC_RECEIVE_SG_COUNT* sizeof(PAGE_BUFFER)), GFP_KERNEL);

		packet = kzalloc(sizeof(struct hv_netvsc_packet) + (NETVSC_RECEIVE_SG_COUNT* sizeof(struct hv_page_buffer)), GFP_KERNEL);

		if (!packet)

		{

			DPRINT_DBG(NETVSC, "unable to allocate netvsc pkts for receive pool (wanted %d got %d)", NETVSC_RECEIVE_PACKETLIST_COUNT, i);