* [PATCH v1 1/1] HID: debug: Remove duplicate entry (BTN_WHEEL)
@ 2025-07-10 9:41 Andy Shevchenko
2025-07-10 10:07 ` Benjamin Tissoires
0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2025-07-10 9:41 UTC (permalink / raw)
To: Jiri Kosina, linux-input, linux-kernel
Cc: Benjamin Tissoires, Vicki Pfau, 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",
| ^~~~~~~~~~~~~
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")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/hid/hid-debug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 62f31e95bd36..e86bda0dab9b 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -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",
--
2.47.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1 1/1] HID: debug: Remove duplicate entry (BTN_WHEEL)
2025-07-10 9:41 [PATCH v1 1/1] HID: debug: Remove duplicate entry (BTN_WHEEL) Andy Shevchenko
@ 2025-07-10 10:07 ` Benjamin Tissoires
2025-07-10 12:16 ` Andy Shevchenko
0 siblings, 1 reply; 3+ messages in thread
From: Benjamin Tissoires @ 2025-07-10 10:07 UTC (permalink / raw)
To: Jiri Kosina, linux-input, linux-kernel, Andy Shevchenko; +Cc: Vicki Pfau
On Thu, 10 Jul 2025 12:41:20 +0300, Andy Shevchenko wrote:
> 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,
--
Benjamin Tissoires <bentiss@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1 1/1] HID: debug: Remove duplicate entry (BTN_WHEEL)
2025-07-10 10:07 ` Benjamin Tissoires
@ 2025-07-10 12:16 ` Andy Shevchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2025-07-10 12:16 UTC (permalink / raw)
To: Benjamin Tissoires; +Cc: Jiri Kosina, linux-input, linux-kernel, Vicki Pfau
On Thu, Jul 10, 2025 at 12:07:22PM +0200, Benjamin Tissoires wrote:
> On Thu, 10 Jul 2025 12:41:20 +0300, Andy Shevchenko wrote:
[...]
> 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!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-10 12:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-10 9:41 [PATCH v1 1/1] HID: debug: Remove duplicate entry (BTN_WHEEL) Andy Shevchenko
2025-07-10 10:07 ` Benjamin Tissoires
2025-07-10 12:16 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.