From: Bastien Nocera Date: Thu, 2 Mar 2023 10:55:50 +0000 (+0100) Subject: HID: logitech-hidpp: Simplify array length check X-Git-Tag: v6.4-rc1~120^2~4^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0138763be2d8bcc181c2f6110ef0f66979f1ce4;p=thirdparty%2Fkernel%2Flinux.git HID: logitech-hidpp: Simplify array length check Use the compiler to force a 100-length array, rather than check the length after the fact. Signed-off-by: Bastien Nocera Link: https://lore.kernel.org/r/20230302105555.51417-1-hadess@hadess.net Signed-off-by: Benjamin Tissoires --- diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index da89e84c9cbeb..6f4d31d208326 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -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",