aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2014-02-05 16:33:19 -0500
committerJiri Kosina <jkosina@suse.cz>2014-02-17 08:05:56 -0500
commitb40272e4d0e6d07a0bf9409e5f95d622422cd73d (patch)
treef2cf257cf8ce450931e6976d6f92ceffea6ce476
parent2f0cd0300e8f73c1a02bd11a6185a5c8534f4b09 (diff)
HID: remove hidinput_input_event handler
All the different transport drivers use now the generic event handling in hid-input. We can remove the handler definitively now. Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-input.c4
-rw-r--r--include/linux/hid.h4
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d50e7313b171..e5bb3c378292 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1263,9 +1263,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid)
1263 } 1263 }
1264 1264
1265 input_set_drvdata(input_dev, hid); 1265 input_set_drvdata(input_dev, hid);
1266 if (hid->ll_driver->hidinput_input_event) 1266 if (hid->ll_driver->request || hid->hid_output_raw_report)
1267 input_dev->event = hid->ll_driver->hidinput_input_event;
1268 else if (hid->ll_driver->request || hid->hid_output_raw_report)
1269 input_dev->event = hidinput_input_event; 1267 input_dev->event = hidinput_input_event;
1270 input_dev->open = hidinput_open; 1268 input_dev->open = hidinput_open;
1271 input_dev->close = hidinput_close; 1269 input_dev->close = hidinput_close;
diff --git a/include/linux/hid.h b/include/linux/hid.h
index dddcad07c2d9..38c307b8138a 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -675,7 +675,6 @@ struct hid_driver {
675 * @stop: called on remove 675 * @stop: called on remove
676 * @open: called by input layer on open 676 * @open: called by input layer on open
677 * @close: called by input layer on close 677 * @close: called by input layer on close
678 * @hidinput_input_event: event input event (e.g. ff or leds)
679 * @parse: this method is called only once to parse the device data, 678 * @parse: this method is called only once to parse the device data,
680 * shouldn't allocate anything to not leak memory 679 * shouldn't allocate anything to not leak memory
681 * @request: send report request to device (e.g. feature report) 680 * @request: send report request to device (e.g. feature report)
@@ -693,9 +692,6 @@ struct hid_ll_driver {
693 692
694 int (*power)(struct hid_device *hdev, int level); 693 int (*power)(struct hid_device *hdev, int level);
695 694
696 int (*hidinput_input_event) (struct input_dev *idev, unsigned int type,
697 unsigned int code, int value);
698
699 int (*parse)(struct hid_device *hdev); 695 int (*parse)(struct hid_device *hdev);
700 696
701 void (*request)(struct hid_device *hdev, 697 void (*request)(struct hid_device *hdev,