HID: allow resizing and replacing report descriptors

Update hid_driver's report_fixup prototype to allow changing report
descriptor size and/or returning completely different report descriptor.
Update existing usage accordingly.

This is to give more freedom in descriptor fixup and to allow having a whole
fixed descriptor in the code for the sake of readability.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index bba05d0a8980..eaeca564a8d3 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -246,17 +246,18 @@ static int apple_event(struct hid_device *hdev, struct hid_field *field,
 /*
  * MacBook JIS keyboard has wrong logical maximum
  */
-static void apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-                unsigned int rsize)
+static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int *rsize)
 {
         struct apple_sc *asc = hid_get_drvdata(hdev);
 
-        if ((asc->quirks & APPLE_RDESC_JIS) && rsize >= 60 &&
+        if ((asc->quirks & APPLE_RDESC_JIS) && *rsize >= 60 &&
                         rdesc[53] == 0x65 && rdesc[59] == 0x65) {
                 dev_info(&hdev->dev, "fixing up MacBook JIS keyboard report "
                                 "descriptor\n");
                 rdesc[53] = rdesc[59] = 0xe7;
         }
+        return rdesc;
 }
 
 static void apple_setup_input(struct input_dev *input)