aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 22:24:05 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 22:24:05 -0500
commit98ad91ed32f6d9327b630f11315a40097e7897b2 (patch)
tree0edbfa7ea7f45023a9205148f8bc990aa85aeea2
parent325eae14448a7ce5e2410f61901fd740e6e93f7d (diff)
Staging: hv: hv_mouse: clean up camelcase when using struct hv_input_dev_info
I think there's a callback we can remove that uses this variable in the future as well, but that's for another patch... Cc: Hank Janssen <hjanssen@microsoft.com> Cc: K. Y. Srinivasan <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/hv/hv_mouse.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 98242cffe20..2ed67d93aed 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -116,7 +116,7 @@ struct synthhid_protocol_response {
116 116
117struct synthhid_device_info { 117struct synthhid_device_info {
118 struct synthhid_msg_hdr header; 118 struct synthhid_msg_hdr header;
119 struct hv_input_dev_info HidDeviceAttributes; 119 struct hv_input_dev_info hid_dev_info;
120 unsigned char HidDescriptorInformation[1]; 120 unsigned char HidDescriptorInformation[1];
121}; 121};
122 122
@@ -184,7 +184,7 @@ struct mousevsc_dev {
184 struct hid_descriptor *HidDesc; 184 struct hid_descriptor *HidDesc;
185 unsigned char *ReportDesc; 185 unsigned char *ReportDesc;
186 u32 ReportDescSize; 186 u32 ReportDescSize;
187 struct hv_input_dev_info DeviceAttr; 187 struct hv_input_dev_info hid_dev_info;
188}; 188};
189 189
190 190
@@ -349,7 +349,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
349 InputDevice->DeviceInfoStatus = 0; 349 InputDevice->DeviceInfoStatus = 0;
350 350
351 /* Save the device attr */ 351 /* Save the device attr */
352 memcpy(&InputDevice->DeviceAttr, &DeviceInfo->HidDeviceAttributes, sizeof(struct hv_input_dev_info)); 352 memcpy(&InputDevice->hid_dev_info, &DeviceInfo->hid_dev_info, sizeof(struct hv_input_dev_info));
353 353
354 /* Save the hid desc */ 354 /* Save the hid desc */
355 desc = (struct hid_descriptor *)DeviceInfo->HidDescriptorInformation; 355 desc = (struct hid_descriptor *)DeviceInfo->HidDescriptorInformation;
@@ -669,7 +669,7 @@ static int MousevscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
669 int ret = 0; 669 int ret = 0;
670 struct mousevsc_dev *inputDevice; 670 struct mousevsc_dev *inputDevice;
671 struct mousevsc_drv_obj *inputDriver; 671 struct mousevsc_drv_obj *inputDriver;
672 struct hv_input_dev_info deviceInfo; 672 struct hv_input_dev_info dev_info;
673 673
674 inputDevice = AllocInputDevice(Device); 674 inputDevice = AllocInputDevice(Device);
675 675
@@ -708,13 +708,13 @@ static int MousevscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
708 708
709 inputDriver = (struct mousevsc_drv_obj *)inputDevice->Device->drv; 709 inputDriver = (struct mousevsc_drv_obj *)inputDevice->Device->drv;
710 710
711 deviceInfo.vendor = inputDevice->DeviceAttr.vendor; 711 dev_info.vendor = inputDevice->hid_dev_info.vendor;
712 deviceInfo.product = inputDevice->DeviceAttr.product; 712 dev_info.product = inputDevice->hid_dev_info.product;
713 deviceInfo.version = inputDevice->DeviceAttr.version; 713 dev_info.version = inputDevice->hid_dev_info.version;
714 strcpy(deviceInfo.name, "Microsoft Vmbus HID-compliant Mouse"); 714 strcpy(dev_info.name, "Microsoft Vmbus HID-compliant Mouse");
715 715
716 /* Send the device info back up */ 716 /* Send the device info back up */
717 deviceinfo_callback(Device, &deviceInfo); 717 deviceinfo_callback(Device, &dev_info);
718 718
719 /* Send the report desc back up */ 719 /* Send the report desc back up */
720 /* workaround SA-167 */ 720 /* workaround SA-167 */