Skip to content

Commit

Permalink
Staging: hv: Get rid of the indirection to invoke mousevsc_on_device_…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent d1f01b3 commit f1f66f8
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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,
Expand Down

0 comments on commit f1f66f8

Please sign in to comment.