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@xxxxxxxxxxxxx>
Cc: K. Y. Srinivasan <kys@xxxxxxxxxxxxx>
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/hv/hv_mouse.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 98242cf..2ed67d9 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -116,7 +116,7 @@ struct synthhid_protocol_response {
struct synthhid_device_info {
struct synthhid_msg_hdr header;
- struct hv_input_dev_info HidDeviceAttributes;
+ struct hv_input_dev_info hid_dev_info;
unsigned char HidDescriptorInformation[1];
};
@@ -184,7 +184,7 @@ struct mousevsc_dev {
struct hid_descriptor *HidDesc;
unsigned char *ReportDesc;
u32 ReportDescSize;
- struct hv_input_dev_info DeviceAttr;
+ struct hv_input_dev_info hid_dev_info;
};
@@ -349,7 +349,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
InputDevice->DeviceInfoStatus = 0;
/* Save the device attr */
- memcpy(&InputDevice->DeviceAttr, &DeviceInfo->HidDeviceAttributes, sizeof(struct hv_input_dev_info));
+ memcpy(&InputDevice->hid_dev_info, &DeviceInfo->hid_dev_info, sizeof(struct hv_input_dev_info));
/* Save the hid desc */
desc = (struct hid_descriptor *)DeviceInfo->HidDescriptorInformation;
@@ -669,7 +669,7 @@ static int MousevscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
int ret = 0;
struct mousevsc_dev *inputDevice;
struct mousevsc_drv_obj *inputDriver;
- struct hv_input_dev_info deviceInfo;
+ struct hv_input_dev_info dev_info;
inputDevice = AllocInputDevice(Device);
@@ -708,13 +708,13 @@ static int MousevscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
inputDriver = (struct mousevsc_drv_obj *)inputDevice->Device->drv;
- deviceInfo.vendor = inputDevice->DeviceAttr.vendor;
- deviceInfo.product = inputDevice->DeviceAttr.product;
- deviceInfo.version = inputDevice->DeviceAttr.version;
- strcpy(deviceInfo.name, "Microsoft Vmbus HID-compliant Mouse");
+ dev_info.vendor = inputDevice->hid_dev_info.vendor;
+ dev_info.product = inputDevice->hid_dev_info.product;
+ dev_info.version = inputDevice->hid_dev_info.version;
+ strcpy(dev_info.name, "Microsoft Vmbus HID-compliant Mouse");
/* Send the device info back up */
- deviceinfo_callback(Device, &deviceInfo);
+ deviceinfo_callback(Device, &dev_info);
/* Send the report desc back up */
/* workaround SA-167 */
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
