diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2011-09-29 18:54:56 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-04 17:39:36 (GMT) |
commit | 8660e38fab8b8a39ac828fb8a8579a9ad1b5d59d (patch) | |
tree | 44656e939d68df7a20ad03a8e36d017a6b735467 /drivers/staging/hv | |
parent | 1486dd0d0a95de1aaedd17ece19d9263ce7e5192 (diff) | |
download | linux-8660e38fab8b8a39ac828fb8a8579a9ad1b5d59d.tar.xz |
Staging: hv: mousevsc: Cleanup mousevsc_connect_to_vsp()
Cleanup mousevsc_connect_to_vsp(). There is no need to take reference on the
mousevsc device object when we are setting up the device. As part of this
cleanup get rid of get_input_device() as this function is only used here.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv')
-rw-r--r-- | drivers/staging/hv/hv_mouse.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index fc0ba68..75ea2db 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -204,32 +204,6 @@ static void free_input_device(struct mousevsc_dev *device) } /* - * Get the inputdevice object if exists and its refcount > 1 - */ -static struct mousevsc_dev *get_input_device(struct hv_device *device) -{ - struct mousevsc_dev *input_dev; - - input_dev = hv_get_drvdata(device); - -/* - * FIXME - * This sure isn't a valid thing to print for debugging, no matter - * what the intention is... - * - * printk(KERN_ERR "-------------------------> REFCOUNT = %d", - * input_dev->ref_count); - */ - - if (input_dev && atomic_read(&input_dev->ref_count) > 1) - atomic_inc(&input_dev->ref_count); - else - input_dev = NULL; - - return input_dev; -} - -/* * Get the inputdevice object iff exists and its refcount > 0 */ static struct mousevsc_dev *must_get_input_device(struct hv_device *device) @@ -520,15 +494,10 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) { int ret = 0; int t; - struct mousevsc_dev *input_dev; + struct mousevsc_dev *input_dev = hv_get_drvdata(device); struct mousevsc_prt_msg *request; struct mousevsc_prt_msg *response; - input_dev = get_input_device(device); - - if (!input_dev) - return -ENODEV; - request = &input_dev->protocol_req; @@ -584,7 +553,6 @@ static int mousevsc_connect_to_vsp(struct hv_device *device) ret = -ENOMEM; cleanup: - put_input_device(device); return ret; } |