diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 14:28:46 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 14:28:46 +0300 |
| commit | e2d39e0f95cb414b1fb6530f8429ad411586922b (patch) | |
| tree | 58ebf7762babc6fd8fd443fde9002cc7aa89202f /include/linux | |
| parent | 108ff0e8012ae10708168940c7474318fb343751 (diff) | |
| parent | 2ddc8e2d2b5902b376fee51585c8eed72b8836e7 (diff) | |
| download | linux-e2d39e0f95cb414b1fb6530f8429ad411586922b.tar.xz | |
Merge branch 'for-4.17/upstream' into for-linus
Pull a few small generic code cleanups.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hid.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 0f5cc64b2e51..8da3e1f48195 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -687,8 +687,6 @@ struct hid_usage_id { * @input_mapped: invoked on input registering after mapping an usage * @input_configured: invoked just before the device is registered * @feature_mapping: invoked on feature registering - * @bus_add_driver: invoked when a HID driver is about to be added - * @bus_removed_driver: invoked when a HID driver has been removed * @suspend: invoked on suspend (NULL means nop) * @resume: invoked on resume if device was not reset (NULL means nop) * @reset_resume: invoked on resume if device was reset (NULL means nop) @@ -743,8 +741,6 @@ struct hid_driver { void (*feature_mapping)(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage); - void (*bus_add_driver)(struct hid_driver *driver); - void (*bus_removed_driver)(struct hid_driver *driver); #ifdef CONFIG_PM int (*suspend)(struct hid_device *hdev, pm_message_t message); int (*resume)(struct hid_device *hdev); |