summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorK. Y. Srinivasan2011-05-10 16:55:07 +0200
committerGreg Kroah-Hartman2011-05-11 22:48:51 +0200
commitf1f66f8f0cb412b70838b1b4d8b03f953e09dd8c (patch)
tree1334cbf597bcd9dde640fc39f9022af7f66b8d28 /drivers
parentStaging: hv: Get rid of the indirection to invoke mousevsc_on_device_add() (diff)
downloadkernel-qcow2-linux-f1f66f8f0cb412b70838b1b4d8b03f953e09dd8c.tar.gz
kernel-qcow2-linux-f1f66f8f0cb412b70838b1b4d8b03f953e09dd8c.tar.xz
kernel-qcow2-linux-f1f66f8f0cb412b70838b1b4d8b03f953e09dd8c.zip
Staging: hv: Get rid of the indirection to invoke mousevsc_on_device_remove
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Abhishek Kane <v-abkane@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/hv/hv_mouse.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 43f515870285..b7016e2faffd 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -859,9 +859,6 @@ static int mousevsc_remove(struct hv_device *dev)
{
int ret = 0;
- struct mousevsc_drv_obj *mousevsc_drv_obj =
- drv_to_mousedrv(dev->device.driver);
-
struct input_device_context *input_dev_ctx;
input_dev_ctx = kmalloc(sizeof(struct input_device_context),
@@ -874,14 +871,11 @@ static int mousevsc_remove(struct hv_device *dev)
input_dev_ctx->connected = 0;
}
- if (!mousevsc_drv_obj->base.dev_rm)
- return -1;
-
/*
* Call to the vsc driver to let it know that the device
* is being removed
*/
- ret = mousevsc_drv_obj->base.dev_rm(dev);
+ ret = mousevsc_on_device_remove(dev);
if (ret != 0) {
DPRINT_ERR(INPUTVSC_DRV,