Staging: hv: mousevsc: Cleanup error handling

Cleanup error handling in this driver; use standard Linux error codes.

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>

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 8dd902a901b095316c80c98c6518fb5661ab247c..fc1f3e60d0f4870de56ce3649da0a785df89d0c3 100644 (file)
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -569,7 +569,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
 
        if (!input_dev) {
                pr_err("unable to get input device...device being destroyed?");
-               return -1;
+               return -ENODEV;
        }
 
 
@@ -612,7 +612,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
        if (!response->response.approved) {
                pr_err("synthhid protocol request failed (version %d)",
                       SYNTHHID_INPUT_VERSION);
-               ret = -1;
+               ret = -ENODEV;
                goto cleanup;
        }
 
@@ -629,7 +629,7 @@ static int mousevsc_connect_to_vsp(struct hv_device *device)
        if (!input_dev->dev_info_status)
                pr_info("**** input channel up and running!! ****");
        else
-               ret = -1;
+               ret = -ENOMEM;
 
 cleanup:
        put_input_device(device);
@@ -694,10 +694,8 @@ static int mousevsc_on_device_add(struct hv_device *device,
 
        input_dev = alloc_input_device(device);
 
-       if (!input_dev) {
-               ret = -1;
-               goto cleanup;
-       }
+       if (!input_dev)
+               return -ENOMEM;
 
        input_dev->init_complete = false;
 
@@ -714,7 +712,7 @@ static int mousevsc_on_device_add(struct hv_device *device,
        if (ret != 0) {
                pr_err("unable to open channel: %d", ret);
                free_input_device(input_dev);
-               return -1;
+               return ret;
        }
 
        pr_info("InputVsc channel open: %d", ret);
@@ -743,7 +741,6 @@ static int mousevsc_on_device_add(struct hv_device *device,
 
        input_dev->init_complete = true;
 
-cleanup:
        return ret;
 }
 
@@ -789,16 +786,10 @@ static int mousevsc_on_device_remove(struct hv_device *device)
 static int mousevsc_probe(struct hv_device *dev,
                        const struct hv_vmbus_device_id *dev_id)
 {
-       int ret = 0;
-
 
        /* Call to the vsc driver to add the device */
-       ret = mousevsc_on_device_add(dev, NULL);
+       return mousevsc_on_device_add(dev, NULL);
 
-       if (ret != 0)
-               return -1;
-
-       return 0;
 }
 
 static int mousevsc_remove(struct hv_device *dev)