Skip to content

Commit

Permalink
HID: remove hidinput_input_event handler
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Tissoires authored and Jiri Kosina committed Feb 17, 2014
1 parent 2f0cd03 commit b40272e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
4 changes: 1 addition & 3 deletions drivers/hid/hid-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -1263,9 +1263,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid)
}

input_set_drvdata(input_dev, hid);
if (hid->ll_driver->hidinput_input_event)
input_dev->event = hid->ll_driver->hidinput_input_event;
else if (hid->ll_driver->request || hid->hid_output_raw_report)
if (hid->ll_driver->request || hid->hid_output_raw_report)
input_dev->event = hidinput_input_event;
input_dev->open = hidinput_open;
input_dev->close = hidinput_close;
Expand Down
4 changes: 0 additions & 4 deletions include/linux/hid.h
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,6 @@ struct hid_driver {
* @stop: called on remove
* @open: called by input layer on open
* @close: called by input layer on close
* @hidinput_input_event: event input event (e.g. ff or leds)
* @parse: this method is called only once to parse the device data,
* shouldn't allocate anything to not leak memory
* @request: send report request to device (e.g. feature report)
Expand All @@ -693,9 +692,6 @@ struct hid_ll_driver {

int (*power)(struct hid_device *hdev, int level);

int (*hidinput_input_event) (struct input_dev *idev, unsigned int type,
unsigned int code, int value);

int (*parse)(struct hid_device *hdev);

void (*request)(struct hid_device *hdev,
Expand Down

0 comments on commit b40272e

Please sign in to comment.