diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-11-03 08:19:14 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-03 08:19:14 -0500 |
| commit | 1e48d542e751f766d0ff03aa97bef22d90a98041 (patch) | |
| tree | c8fce762f1176aff41f720fad9666fea0248b794 | |
| parent | 1a3f83f6493f9d78aa0fe31401fd530b0fe296da (diff) | |
HID: plantronics: remove superfluous .probe()
Remove redundanct probe() callback, as it isn't doing anything extra
that HID core wouldn't do by default.
Reported-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-plantronics.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c index 215cdbd10dea..2180e0789b76 100644 --- a/drivers/hid/hid-plantronics.c +++ b/drivers/hid/hid-plantronics.c | |||
| @@ -36,28 +36,6 @@ static int plantronics_input_mapping(struct hid_device *hdev, | |||
| 36 | return -1; | 36 | return -1; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | static int plantronics_probe(struct hid_device *hdev, | ||
| 40 | const struct hid_device_id *id) | ||
| 41 | { | ||
| 42 | int ret; | ||
| 43 | |||
| 44 | ret = hid_parse(hdev); | ||
| 45 | if (ret) { | ||
| 46 | hid_err(hdev, "parse failed\n"); | ||
| 47 | goto err; | ||
| 48 | } | ||
| 49 | |||
| 50 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); | ||
| 51 | if (ret) { | ||
| 52 | hid_err(hdev, "hw start failed\n"); | ||
| 53 | goto err; | ||
| 54 | } | ||
| 55 | |||
| 56 | return 0; | ||
| 57 | err: | ||
| 58 | return ret; | ||
| 59 | } | ||
| 60 | |||
| 61 | static const struct hid_device_id plantronics_devices[] = { | 39 | static const struct hid_device_id plantronics_devices[] = { |
| 62 | { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) }, | 40 | { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) }, |
| 63 | { } | 41 | { } |
| @@ -68,7 +46,6 @@ static struct hid_driver plantronics_driver = { | |||
| 68 | .name = "plantronics", | 46 | .name = "plantronics", |
| 69 | .id_table = plantronics_devices, | 47 | .id_table = plantronics_devices, |
| 70 | .input_mapping = plantronics_input_mapping, | 48 | .input_mapping = plantronics_input_mapping, |
| 71 | .probe = plantronics_probe, | ||
| 72 | }; | 49 | }; |
| 73 | module_hid_driver(plantronics_driver); | 50 | module_hid_driver(plantronics_driver); |
| 74 | 51 | ||
