[PATCH 081/206] Staging: hv: Get rid of the indirection to invoke mousevsc_on_device_remove

K. Y. Srinivasan
2011-05-09T21:55:24Z

The subject line says it all.

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>
---
drivers/staging/hv/hv_mouse.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 43f5158..b7016e2 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,
--
1.7.4.1