From d5b9cd2609f7486798a777e2380920204d2e78b6 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 29 Sep 2011 11:55:02 -0700 Subject: [PATCH] --- yaml --- r: 268674 b: refs/heads/master c: 929ad795f0a8d3419ea19c76d7c13ebb96c49286 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/hv_mouse.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 61f9a55d747f..b4f70e02eae6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e56f27c09ec695fd0091476772e38fe9ccaa5a9 +refs/heads/master: 929ad795f0a8d3419ea19c76d7c13ebb96c49286 diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c index a526ba5ced3d..98ae0621c00f 100644 --- a/trunk/drivers/staging/hv/hv_mouse.c +++ b/trunk/drivers/staging/hv/hv_mouse.c @@ -513,12 +513,10 @@ static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len) input_device->hid_device = hid_dev; } -static int mousevsc_on_device_add(struct hv_device *device, - void *additional_info) +static int mousevsc_on_device_add(struct hv_device *device) { int ret = 0; struct mousevsc_dev *input_dev; - struct hv_driver *input_drv; input_dev = alloc_input_device(device); @@ -551,9 +549,6 @@ static int mousevsc_on_device_add(struct hv_device *device, return ret; } - input_drv = drv_to_hv_drv(input_dev->device->device.driver); - - /* Send the report desc back up */ /* workaround SA-167 */ @@ -573,7 +568,7 @@ static int mousevsc_probe(struct hv_device *dev, { /* Call to the vsc driver to add the device */ - return mousevsc_on_device_add(dev, NULL); + return mousevsc_on_device_add(dev); }