From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:55:07 +0000 (-0700) Subject: Staging: hv: Get rid of the indirection to invoke mousevsc_on_device_remove X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f1f66f8f0cb412b70838b1b4d8b03f953e09dd8c;p=deliverable%2Flinux.git Staging: hv: Get rid of the indirection to invoke mousevsc_on_device_remove Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- 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,