Skip to contentSkip to conversation

HID: debug: Remove duplicate entry (BTN_WHEEL)

PATCH Applied Andy Shevchenko 2 participants 3 messages Jul 10, 2025 HID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HID: debug: Remove duplicate entry (BTN_WHEEL)

BTN_WHEEL is duplicated (by value) and compiler is not happy about that:

drivers/hid/hid-debug.c:3302:16: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides]
3302 | [BTN_WHEEL] = "BtnWheel", [KEY_OK] = "Ok",

      |                       ^~~~~~~~~~
drivers/hid/hid-debug.c:3301:20: note: previous initialization is here
 3301 |         [BTN_GEAR_DOWN] = "BtnGearDown",        [BTN_GEAR_UP] = "BtnGearUp",
      |                           ^~~~~~~~~~~~~

Remove it again, as the commit 7b2daa648eb7 ("HID: debug: Remove duplicates from 'keys'") already did this once in the past.

Fixes 194808a1ea39 ("HID: Fix debug name for BTN_GEAR_DOWN, BTN_GEAR_UP, BTN_WHEEL")
---
 drivers/hid/hid-debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-debug.c +1 -1
index 62f31e95bd36..e86bda0dab9b 100644
@@ -3299,7 +3299,7 @@ static const char *keys[KEY_MAX + 1] = {
 	[BTN_STYLUS2] = "Stylus2",		[BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",
 	[BTN_TOOL_TRIPLETAP] = "ToolTripleTap",	[BTN_TOOL_QUADTAP] = "ToolQuadrupleTap",
 	[BTN_GEAR_DOWN] = "BtnGearDown",	[BTN_GEAR_UP] = "BtnGearUp",
-	[BTN_WHEEL] = "BtnWheel",		[KEY_OK] = "Ok",
+						[KEY_OK] = "Ok",
 	[KEY_SELECT] = "Select",		[KEY_GOTO] = "Goto",
 	[KEY_CLEAR] = "Clear",			[KEY_POWER2] = "Power2",
 	[KEY_OPTION] = "Option",		[KEY_INFO] = "Info",
Signature · 1 line
2.47.2
maintainer Applied
#1 lore raw
Quoted 10 lines · Andy Shevchenko

BTN_WHEEL is duplicated (by value) and compiler is not happy about that:

drivers/hid/hid-debug.c:3302:16: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides]
3302 | [BTN_WHEEL] = "BtnWheel", [KEY_OK] = "Ok",

      |                       ^~~~~~~~~~
drivers/hid/hid-debug.c:3301:20: note: previous initialization is here
 3301 |         [BTN_GEAR_DOWN] = "BtnGearDown",        [BTN_GEAR_UP] = "BtnGearUp",
      |                           ^~~~~~~~~~~~~

[...]

Applied to hid/hid.git (for-6.16/upstream-fixes), thanks!

[1/1] HID: debug: Remove duplicate entry (BTN_WHEEL)

      https://git.kernel.org/hid/hid/c/04515e08bca9

Cheers,

Signature · 1 line
Benjamin Tissoires <[email protected]>
#2 lore raw
Quoted 1 line · Benjamin Tissoires

On Thu, 10 Jul 2025 12:41:20 +0300, Andy Shevchenko wrote:

[...]

Quoted 4 lines

Applied to hid/hid.git (for-6.16/upstream-fixes), thanks!

[1/1] HID: debug: Remove duplicate entry (BTN_WHEEL)

      https://git.kernel.org/hid/hid/c/04515e08bca9

Thanks for prompt action!

Signature · 2 lines
With Best Regards,
Andy Shevchenko