HID: wacom: do not call hid_set_drvdata(hdev, NULL)

This is a common pattern in the HID drivers to reset the drvdata.
However, this is actually already handled by driver core, so there
is no need to do it manually.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 602219a..5ded94b 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2719,14 +2719,12 @@ static int wacom_probe(struct hid_device *hdev,
        wacom_wac->features = *((struct wacom_features *)id->driver_data);
        features = &wacom_wac->features;
 
-       if (features->check_for_hid_type && features->hid_type != hdev->type) {
-               error = -ENODEV;
-               goto fail;
-       }
+       if (features->check_for_hid_type && features->hid_type != hdev->type)
+               return -ENODEV;
 
        error = kfifo_alloc(&wacom_wac->pen_fifo, WACOM_PKGLEN_MAX, GFP_KERNEL);
        if (error)
-               goto fail;
+               return error;
 
        wacom_wac->hid_data.inputmode = -1;
        wacom_wac->mode_report = -1;
@@ -2744,12 +2742,12 @@ static int wacom_probe(struct hid_device *hdev,
        error = hid_parse(hdev);
        if (error) {
                hid_err(hdev, "parse failed\n");
-               goto fail;
+               return error;
        }
 
        error = wacom_parse_and_register(wacom, false);
        if (error)
-               goto fail;
+               return error;
 
        if (hdev->bus == BUS_BLUETOOTH) {
                error = device_create_file(&hdev->dev, &dev_attr_speed);
@@ -2760,10 +2758,6 @@ static int wacom_probe(struct hid_device *hdev,
        }
 
        return 0;
-
-fail:
-       hid_set_drvdata(hdev, NULL);
-       return error;
 }
 
 static void wacom_remove(struct hid_device *hdev)
@@ -2792,8 +2786,6 @@ static void wacom_remove(struct hid_device *hdev)
                wacom_release_resources(wacom);
 
        kfifo_free(&wacom_wac->pen_fifo);
-
-       hid_set_drvdata(hdev, NULL);
 }
 
 #ifdef CONFIG_PM