Staging: hv: mousevsc: Cleanup mousevsc_connect_to_vsp()
authorK. Y. Srinivasan <kys@microsoft.com>
Thu, 29 Sep 2011 18:54:56 +0000 (11:54 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 4 Oct 2011 17:39:36 +0000 (10:39 -0700)
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>
drivers/staging/hv/hv_mouse.c

index fc0ba6879cf498384549ac1398a29b136b94fe79..75ea2db1a75084821ab63e96fbd500c9d804ad63 100644 (file)
@@ -203,32 +203,6 @@ static void free_input_device(struct mousevsc_dev *device)
        kfree(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
  */
@@ -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;
 }