HID: make .raw_request mandatory

SET_REPORT and GET_REPORT are mandatory in the HID specification.
Make the corresponding API in hid-core mandatory too, which removes the
need to test against it in some various places.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

2 files changed, 9 insertions, 6 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b6ae69711d2a..0b57babe3f9f 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1330,9 +1330,6 @@ void __hid_request(struct hid_device *hid, struct hid_report *report,
         int ret;
         int len;
 
-        if (!hid->ll_driver->raw_request)
-                return;
-
         buf = hid_alloc_report_buf(report, GFP_KERNEL);
         if (!buf)
                 return;
@@ -2472,6 +2469,14 @@ int hid_add_device(struct hid_device *hdev)
                 return -ENODEV;
 
         /*
+         * Check for the mandatory transport channel.
+         */
+         if (!hdev->ll_driver->raw_request) {
+                hid_err(hdev, "transport driver missing .raw_request()\n");
+                return -EINVAL;
+         }
+
+        /*
          * Read the device report descriptor once and use as template
          * for the driver-specific modifications.
          */
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 310b96779e8e..f5aef792f13b 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1266,9 +1266,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid)
         }
 
         input_set_drvdata(input_dev, hid);
-        if (hid->ll_driver->request || hid->ll_driver->output_report ||
-            hid->ll_driver->raw_request)
-                input_dev->event = hidinput_input_event;
+        input_dev->event = hidinput_input_event;
         input_dev->open = hidinput_open;
         input_dev->close = hidinput_close;
         input_dev->setkeycode = hidinput_setkeycode;