HID: uhid: rename uhid_raw_request to uhid_hid_raw_request

We use strict prefixed in uhid.c:
  uhid_char_*: implement char-dev callbacks
  uhid_dev_*: implement uhid device management and runtime
  uhid_hid_*: implement hid-dev callbacks

uhid_raw_request is an hid callback, so rename it to uhid_hid_raw_request.

While at it, move it closer to it's extracted helpers and keep the same
order as in "struct hid_driver".

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index 8f5e46b1bb46178137f8efcb5d385685cd3af4e7..8bf613e3783d00377224715a8ebbe2cd55569304 100644 (file)
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -203,6 +203,21 @@ unlock:
        return ret ? ret : len;
 }
 
+static int uhid_hid_raw_request(struct hid_device *hid, unsigned char reportnum,
+                               __u8 *buf, size_t len, unsigned char rtype,
+                               int reqtype)
+{
+       switch (reqtype) {
+       case HID_REQ_GET_REPORT:
+               return uhid_hid_get_report(hid, reportnum, buf, len, rtype);
+       case HID_REQ_SET_REPORT:
+               /* TODO: implement proper SET_REPORT functionality */
+               return -ENOSYS;
+       default:
+               return -EIO;
+       }
+}
+
 static int uhid_hid_output_raw(struct hid_device *hid, __u8 *buf, size_t count,
                               unsigned char report_type)
 {
@@ -247,29 +262,14 @@ static int uhid_hid_output_report(struct hid_device *hid, __u8 *buf,
        return uhid_hid_output_raw(hid, buf, count, HID_OUTPUT_REPORT);
 }
 
-static int uhid_raw_request(struct hid_device *hid, unsigned char reportnum,
-                           __u8 *buf, size_t len, unsigned char rtype,
-                           int reqtype)
-{
-       switch (reqtype) {
-       case HID_REQ_GET_REPORT:
-               return uhid_hid_get_report(hid, reportnum, buf, len, rtype);
-       case HID_REQ_SET_REPORT:
-               /* TODO: implement proper SET_REPORT functionality */
-               return -ENOSYS;
-       default:
-               return -EIO;
-       }
-}
-
 static struct hid_ll_driver uhid_hid_driver = {
        .start = uhid_hid_start,
        .stop = uhid_hid_stop,
        .open = uhid_hid_open,
        .close = uhid_hid_close,
        .parse = uhid_hid_parse,
+       .raw_request = uhid_hid_raw_request,
        .output_report = uhid_hid_output_report,
-       .raw_request = uhid_raw_request,
 };
 
 #ifdef CONFIG_COMPAT