From 1706999c699f1e8f0cd02ede2cb8309d5d454ed7 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 2 Mar 2011 19:38:29 -0800
Subject: [PATCH] --- yaml --- r: 236258 b: refs/heads/master c:
 9877fa4445b907b8aa271783e3e5ee99a143b65c h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/staging/hv/hv_mouse.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 83601b51102d..b2b7893f1706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2012d40dbda6f87537535bad38ccd84f8805de9e
+refs/heads/master: 9877fa4445b907b8aa271783e3e5ee99a143b65c
diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c
index d8945bb61272..5bee3ffb831d 100644
--- a/trunk/drivers/staging/hv/hv_mouse.c
+++ b/trunk/drivers/staging/hv/hv_mouse.c
@@ -146,7 +146,7 @@ enum pipe_prot_msg_type {
 
 struct pipe_prt_msg {
 	enum pipe_prot_msg_type type;
-	u32                DataSize;
+	u32 size;
 	char               Data[1];
 };
 
@@ -155,7 +155,7 @@ struct pipe_prt_msg {
  */
 struct  mousevsc_prt_msg {
 	enum pipe_prot_msg_type type;
-	u32                  DataSize;
+	u32 size;
 	union {
 		struct synthhid_protocol_request Request;
 		struct synthhid_protocol_response Response;
@@ -383,7 +383,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
 	memset(&ack, sizeof(struct mousevsc_prt_msg), 0);
 
 	ack.type = PipeMessageData;
-	ack.DataSize = sizeof(struct synthhid_device_info_ack);
+	ack.size = sizeof(struct synthhid_device_info_ack);
 
 	ack.Ack.header.type = SynthHidInitialDeviceInfoAck;
 	ack.Ack.header.size = 1;
@@ -455,7 +455,7 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript
 
 	if (pipeMsg->type != PipeMessageData) {
 		pr_err("unknown pipe msg type - type %d len %d",
-			   pipeMsg->type, pipeMsg->DataSize);
+			   pipeMsg->type, pipeMsg->size);
 		PutInputDevice(Device);
 		return ;
 	}
@@ -464,13 +464,15 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript
 
 	switch (hidMsg->header.type) {
 	case SynthHidProtocolResponse:
-		memcpy(&inputDevice->ProtocolResp, pipeMsg, pipeMsg->DataSize+sizeof(struct pipe_prt_msg) - sizeof(unsigned char));
+		memcpy(&inputDevice->ProtocolResp, pipeMsg,
+		       pipeMsg->size + sizeof(struct pipe_prt_msg) -
+		       sizeof(unsigned char));
 		inputDevice->protocol_wait_condition = 1;
 		wake_up(&inputDevice->ProtocolWaitEvent);
 		break;
 
 	case SynthHidInitialDeviceInfo:
-		WARN_ON(pipeMsg->DataSize >= sizeof(struct hv_input_dev_info));
+		WARN_ON(pipeMsg->size >= sizeof(struct hv_input_dev_info));
 
 		/*
 		 * Parse out the device info into device attr,
@@ -606,7 +608,7 @@ static int MousevscConnectToVsp(struct hv_device *Device)
 	memset(request, sizeof(struct mousevsc_prt_msg), 0);
 
 	request->type = PipeMessageData;
-	request->DataSize = sizeof(struct synthhid_protocol_request);
+	request->size = sizeof(struct synthhid_protocol_request);
 
 	request->Request.header.type = SynthHidProtocolRequest;
 	request->Request.header.size = sizeof(unsigned long);