diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:30:03 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:30:03 +0200 |
| commit | 7147935a0cf693e86daeaa68811f150140ece024 (patch) | |
| tree | 4886a7eafa844f4b3d0bdccc3fa35869e622f199 /drivers/hid/hid-gfrm.c | |
| parent | 53c716412708db7000e06292fb89b2609f9a48f7 (diff) | |
| parent | 87fcb6a69e54527ccaeb5878168cccdba9f6b6ae (diff) | |
Merge branch 'for-5.4/cleanup' into for-linus
- cleanup of ->drvdata handling between HID core and drivers, from
Benjamin Tissoires
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-gfrm.c')
| -rw-r--r-- | drivers/hid/hid-gfrm.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/hid/hid-gfrm.c b/drivers/hid/hid-gfrm.c index 86c317320bf2..699186ff2349 100644 --- a/drivers/hid/hid-gfrm.c +++ b/drivers/hid/hid-gfrm.c @@ -123,12 +123,6 @@ done: return ret; } -static void gfrm_remove(struct hid_device *hdev) -{ - hid_hw_stop(hdev); - hid_set_drvdata(hdev, NULL); -} - static const struct hid_device_id gfrm_devices[] = { { HID_BLUETOOTH_DEVICE(0x58, 0x2000), .driver_data = GFRM100 }, @@ -142,7 +136,6 @@ static struct hid_driver gfrm_driver = { .name = "gfrm", .id_table = gfrm_devices, .probe = gfrm_probe, - .remove = gfrm_remove, .input_mapping = gfrm_input_mapping, .raw_event = gfrm_raw_event, .input_configured = gfrm_input_configured, |