]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
HID: dr: constify fixed up report descriptor
authorThomas Weißschuh <linux@weissschuh.net>
Wed, 28 Aug 2024 07:33:21 +0000 (09:33 +0200)
committerBenjamin Tissoires <bentiss@kernel.org>
Thu, 5 Sep 2024 14:20:56 +0000 (16:20 +0200)
Now that the HID core can handle const report descriptors,
constify them where possible.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240828-hid-const-fixup-2-v1-2-663b9210eb69@weissschuh.net
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/hid-dr.c

index b24f9bc743e194eb2053b0b35a6b7d3405934bab..84e1e90a266b2114709f1a2b3612ad4f55ab6775 100644 (file)
@@ -199,7 +199,7 @@ static inline int drff_init(struct hid_device *hid)
 #define PID0011_RDESC_ORIG_SIZE        101
 
 /* Fixed report descriptor for PID 0x011 joystick */
-static __u8 pid0011_rdesc_fixed[] = {
+static const __u8 pid0011_rdesc_fixed[] = {
        0x05, 0x01,         /*  Usage Page (Desktop),           */
        0x09, 0x04,         /*  Usage (Joystick),               */
        0xA1, 0x01,         /*  Collection (Application),       */
@@ -234,8 +234,8 @@ static const __u8 *dr_report_fixup(struct hid_device *hdev, __u8 *rdesc,
        switch (hdev->product) {
        case 0x0011:
                if (*rsize == PID0011_RDESC_ORIG_SIZE) {
-                       rdesc = pid0011_rdesc_fixed;
                        *rsize = sizeof(pid0011_rdesc_fixed);
+                       return pid0011_rdesc_fixed;
                }
                break;
        }