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

Staging: hv: typdef fixes for HvSynicApi.h 



Still some volatile mis-usages left to fix.

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

drivers/staging/hv/Channel.c

+7 −7
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void VmbusChannelSetEvent(struct vmbus_channel *channel); 
#if 0

static void

DumpMonitorPage(

	HV_MONITOR_PAGE *MonitorPage

	struct hv_monitor_page *MonitorPage

	)

{

	int i=0;
@@ -85,7 +85,7 @@ DumpMonitorPage( 
--*/

static void VmbusChannelSetEvent(struct vmbus_channel *Channel)

{

	HV_MONITOR_PAGE *monitorPage;

	struct hv_monitor_page *monitorPage;



	DPRINT_ENTER(VMBUS);
@@ -96,7 +96,7 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel) 
			(unsigned long *) gVmbusConnection.SendInterruptPage +

			(Channel->OfferMsg.ChildRelId >> 5) );



		monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;

		monitorPage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;

		monitorPage++; /* Get the child to parent monitor page */



		set_bit(Channel->MonitorBit,
@@ -114,7 +114,7 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel) 
#if 0

static void VmbusChannelClearEvent(struct vmbus_channel *channel)

{

	HV_MONITOR_PAGE *monitorPage;

	struct hv_monitor_page *monitorPage;



	DPRINT_ENTER(VMBUS);
@@ -124,7 +124,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) 
		clear_bit(Channel->OfferMsg.ChildRelId & 31,

			  (unsigned long *) gVmbusConnection.SendInterruptPage + (Channel->OfferMsg.ChildRelId >> 5));



		monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;

		monitorPage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;

		monitorPage++; /* Get the child to parent monitor page */



		clear_bit(Channel->MonitorBit,
@@ -147,7 +147,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) 
void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel,

			      struct vmbus_channel_debug_info *DebugInfo)

{

	HV_MONITOR_PAGE *monitorPage;

	struct hv_monitor_page *monitorPage;

    u8 monitorGroup    = (u8)Channel->OfferMsg.MonitorId / 32;

    u8 monitorOffset   = (u8)Channel->OfferMsg.MonitorId % 32;

	/* u32 monitorBit	= 1 << monitorOffset; */
@@ -157,7 +157,7 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel, 
	memcpy(&DebugInfo->InterfaceType, &Channel->OfferMsg.Offer.InterfaceType, sizeof(struct hv_guid));

	memcpy(&DebugInfo->InterfaceInstance, &Channel->OfferMsg.Offer.InterfaceInstance, sizeof(struct hv_guid));



	monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;

	monitorPage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;



	DebugInfo->MonitorId = Channel->OfferMsg.MonitorId;

drivers/staging/hv/ChannelMgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ VmbusChannelOnVersionResponse( 
--*/

void VmbusOnChannelMessage(void *Context)

{

	HV_MESSAGE *msg=(HV_MESSAGE*)Context;

	struct hv_message *msg = Context;

	VMBUS_CHANNEL_MESSAGE_HEADER* hdr;

	int size;

drivers/staging/hv/Connection.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ void VmbusOnEvents(void) 
int VmbusPostMessage(void *buffer, size_t bufferLen)

{

	int ret=0;

	HV_CONNECTION_ID connId;

	union hv_connection_id connId;





	connId.Asu32 =0;

drivers/staging/hv/Hv.c

+9 −9
Original line number Diff line number Diff line
@@ -385,8 +385,8 @@ void HvCleanup (void) 


--*/

HV_STATUS HvPostMessage(

	HV_CONNECTION_ID connectionId,

	HV_MESSAGE_TYPE  messageType,

	union hv_connection_id connectionId,

	enum hv_message_type messageType,

	void *            payload,

	size_t           payloadSize

	)
@@ -461,10 +461,10 @@ HV_STATUS HvSignalEvent(void) 
int HvSynicInit (u32 irqVector)

{

	u64			version;

	HV_SYNIC_SIMP	simp;

	HV_SYNIC_SIEFP	siefp;

    HV_SYNIC_SINT	sharedSint;

	HV_SYNIC_SCONTROL sctrl;

	union hv_synic_simp simp;

	union hv_synic_siefp siefp;

	union hv_synic_sint sharedSint;

	union hv_synic_scontrol sctrl;

	u64			guestID;

	int ret=0;
@@ -600,9 +600,9 @@ int HvSynicInit (u32 irqVector) 
--*/

void HvSynicCleanup(void)

{

    HV_SYNIC_SINT	sharedSint;

	HV_SYNIC_SIMP	simp;

	HV_SYNIC_SIEFP	siefp;

	union hv_synic_sint sharedSint;

	union hv_synic_simp simp;

	union hv_synic_siefp siefp;



	DPRINT_ENTER(VMBUS);

drivers/staging/hv/Hv.h

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ extern int HvInit(void); 


extern void HvCleanup(void);



extern HV_STATUS HvPostMessage(HV_CONNECTION_ID connectionId,

			       HV_MESSAGE_TYPE messageType,

extern HV_STATUS HvPostMessage(union hv_connection_id connectionId,

			       enum hv_message_type messageType,

			       void *payload,

			       size_t payloadSize);