diff options
| author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:21:50 -0700 |
|---|---|---|
| committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:11:53 -0700 |
| commit | 0e2140a46934e2c8a5ceb4c58c236252925fa046 (patch) | |
| tree | 323827dd6914aaa0dd7ab3f1a416fe4f8b616cfb | |
| parent | a3ed1fae3af45fc85b96ff2a4180977482c8235b (diff) | |
Revert "HID: Extend the interface with report requests"
DO NOT INTEGRATE
Bug 1466757
This reverts commit 2a698014d1e170b736237ad7f7caf046295c413b.
Change-Id: Ib68e1c3c9ff3c6f2e75a27741b1a197fceb38d20
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428063
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 13 | ||||
| -rw-r--r-- | include/linux/hid.h | 19 |
2 files changed, 0 insertions, 32 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index ec70dd25ba59..f03401947718 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1242,18 +1242,6 @@ static int usbhid_power(struct hid_device *hid, int lvl) return r; } -static void usbhid_request(struct hid_device *hid, struct hid_report *rep, int reqtype) -{ - switch (reqtype) { - case HID_REQ_GET_REPORT: - usbhid_submit_report(hid, rep, USB_DIR_IN); - break; - case HID_REQ_SET_REPORT: - usbhid_submit_report(hid, rep, USB_DIR_OUT); - break; - } -} - static struct hid_ll_driver usb_hid_driver = { .parse = usbhid_parse, .start = usbhid_start, @@ -1262,7 +1250,6 @@ static struct hid_ll_driver usb_hid_driver = { .close = usbhid_close, .power = usbhid_power, .hidinput_input_event = usb_hidinput_input_event, - .request = usbhid_request, }; static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id) diff --git a/include/linux/hid.h b/include/linux/hid.h index f8dd77457ec0..773b4acf344f 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -686,7 +686,6 @@ struct hid_driver { * @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) */ struct hid_ll_driver { int (*start)(struct hid_device *hdev); @@ -701,10 +700,6 @@ struct hid_ll_driver { unsigned int code, int value); int (*parse)(struct hid_device *hdev); - - void (*request)(struct hid_device *hdev, - struct hid_report *report, int reqtype); - }; #define PM_HINT_FULLON 1<<5 @@ -905,20 +900,6 @@ static inline int hid_hw_power(struct hid_device *hdev, int level) return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0; } -/** - * hid_hw_request - send report request to device - * - * @hdev: hid device - * @report: report to send - * @reqtype: hid request type - */ -static inline void hid_hw_request(struct hid_device *hdev, - struct hid_report *report, int reqtype) -{ - if (hdev->ll_driver->request) - hdev->ll_driver->request(hdev, report, reqtype); -} - void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, int interrupt); |