HID: logitech-hidpp: Simplify array length check
authorBastien Nocera <hadess@hadess.net>
Thu, 2 Mar 2023 10:55:50 +0000 (11:55 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Mon, 3 Apr 2023 11:30:08 +0000 (13:30 +0200)
Use the compiler to force a 100-length array, rather than check the
length after the fact.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
Link: https://lore.kernel.org/r/20230302105555.51417-1-hadess@hadess.net
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
drivers/hid/hid-logitech-hidpp.c

index da89e84..6f4d31d 100644 (file)
@@ -1404,7 +1404,7 @@ static int hidpp20_map_battery_capacity(struct hid_device *hid_dev, int voltage)
         * there are a few devices that use different battery technology.
         */
 
-       static const int voltages[] = {
+       static const int voltages[100] = {
                4186, 4156, 4143, 4133, 4122, 4113, 4103, 4094, 4086, 4075,
                4067, 4059, 4051, 4043, 4035, 4027, 4019, 4011, 4003, 3997,
                3989, 3983, 3976, 3969, 3961, 3955, 3949, 3942, 3935, 3929,
@@ -1419,8 +1419,6 @@ static int hidpp20_map_battery_capacity(struct hid_device *hid_dev, int voltage)
 
        int i;
 
-       BUILD_BUG_ON(ARRAY_SIZE(voltages) != 100);
-
        if (unlikely(voltage < 3500 || voltage >= 5000))
                hid_warn_once(hid_dev,
                              "%s: possibly using the wrong voltage curve\n",