Commit 43cd97af authored by Benjamin Tissoires's avatar Benjamin Tissoires

HID: logitech: Stop setting drvdata to NULL on probe failure and remove

There is no need to set drvdata to NULL on probe failure and remove,
the driver-core already does this for us.

[hdegoede@redhat.com: Isolate Logitech changes into a separate patch]
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 2fbe5a5d
...@@ -1094,7 +1094,6 @@ static int logi_dj_probe(struct hid_device *hdev, ...@@ -1094,7 +1094,6 @@ static int logi_dj_probe(struct hid_device *hdev,
hid_parse_fail: hid_parse_fail:
kfifo_free(&djrcv_dev->notif_fifo); kfifo_free(&djrcv_dev->notif_fifo);
kfree(djrcv_dev); kfree(djrcv_dev);
hid_set_drvdata(hdev, NULL);
return retval; return retval;
} }
...@@ -1145,7 +1144,6 @@ static void logi_dj_remove(struct hid_device *hdev) ...@@ -1145,7 +1144,6 @@ static void logi_dj_remove(struct hid_device *hdev)
kfifo_free(&djrcv_dev->notif_fifo); kfifo_free(&djrcv_dev->notif_fifo);
kfree(djrcv_dev); kfree(djrcv_dev);
hid_set_drvdata(hdev, NULL);
} }
static const struct hid_device_id logi_dj_receivers[] = { static const struct hid_device_id logi_dj_receivers[] = {
......
...@@ -3231,15 +3231,15 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) ...@@ -3231,15 +3231,15 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) { if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) {
ret = wtp_allocate(hdev, id); ret = wtp_allocate(hdev, id);
if (ret) if (ret)
goto allocate_fail; return ret;
} else if (hidpp->quirks & HIDPP_QUIRK_CLASS_M560) { } else if (hidpp->quirks & HIDPP_QUIRK_CLASS_M560) {
ret = m560_allocate(hdev); ret = m560_allocate(hdev);
if (ret) if (ret)
goto allocate_fail; return ret;
} else if (hidpp->quirks & HIDPP_QUIRK_CLASS_K400) { } else if (hidpp->quirks & HIDPP_QUIRK_CLASS_K400) {
ret = k400_allocate(hdev); ret = k400_allocate(hdev);
if (ret) if (ret)
goto allocate_fail; return ret;
} }
INIT_WORK(&hidpp->work, delayed_work_cb); INIT_WORK(&hidpp->work, delayed_work_cb);
...@@ -3334,8 +3334,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) ...@@ -3334,8 +3334,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
sysfs_remove_group(&hdev->dev.kobj, &ps_attribute_group); sysfs_remove_group(&hdev->dev.kobj, &ps_attribute_group);
cancel_work_sync(&hidpp->work); cancel_work_sync(&hidpp->work);
mutex_destroy(&hidpp->send_mutex); mutex_destroy(&hidpp->send_mutex);
allocate_fail:
hid_set_drvdata(hdev, NULL);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment