[PATCH] HID: Fix debug name for BTN_GEAR_DOWN, BTN_GEAR_UP, BTN_WHEEL

[PATCH] HID: Fix debug name for BTN_GEAR_DOWN, BTN_GEAR_UP, BTN_WHEEL

[Vicki Pfau]

The name of BTN_GEAR_DOWN was WheelBtn and BTN_WHEEL was missing. Further,
BTN_GEAR_UP had a space in its name and no Btn, which is against convention.
This makes the names BtnGearDown, BtnGearUp, and BtnWheel, fixing the errors
and matching convention.

Signed-off-by: Vicki Pfau <vi@endrift.com>
---
 drivers/hid/hid-debug.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 8433306148d5..c6b6b1029540 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -3298,8 +3298,8 @@ static const char *keys[KEY_MAX + 1] = {
 	[BTN_TOUCH] = "Touch",			[BTN_STYLUS] = "Stylus",
 	[BTN_STYLUS2] = "Stylus2",		[BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",
 	[BTN_TOOL_TRIPLETAP] = "ToolTripleTap",	[BTN_TOOL_QUADTAP] = "ToolQuadrupleTap",
-	[BTN_GEAR_DOWN] = "WheelBtn",
-	[BTN_GEAR_UP] = "Gear up",		[KEY_OK] = "Ok",
+	[BTN_GEAR_DOWN] = "BtnGearDown",	[BTN_GEAR_UP] = "BtnGearUp",
+	[BTN_WHEEL] = "BtnWheel",		[KEY_OK] = "Ok",
 	[KEY_SELECT] = "Select",		[KEY_GOTO] = "Goto",
 	[KEY_CLEAR] = "Clear",			[KEY_POWER2] = "Power2",
 	[KEY_OPTION] = "Option",		[KEY_INFO] = "Info",
-- 
2.49.0

Re: [PATCH] HID: Fix debug name for BTN_GEAR_DOWN, BTN_GEAR_UP, BTN_WHEEL

[Jiri Kosina]

On Tue, 1 Jul 2025, Vicki Pfau wrote:

> The name of BTN_GEAR_DOWN was WheelBtn and BTN_WHEEL was missing. Further,
> BTN_GEAR_UP had a space in its name and no Btn, which is against convention.
> This makes the names BtnGearDown, BtnGearUp, and BtnWheel, fixing the errors
> and matching convention.
> 
> Signed-off-by: Vicki Pfau <vi@endrift.com>

Applied to hid.git#for-6.16/upstream-fixes. Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] HID: Fix debug name for BTN_GEAR_DOWN, BTN_GEAR_UP, BTN_WHEEL

[Andy Shevchenko]

On Thu, Jul 03, 2025 at 09:44:54AM +0200, Jiri Kosina wrote:
> On Tue, 1 Jul 2025, Vicki Pfau wrote:
> 
> > The name of BTN_GEAR_DOWN was WheelBtn and BTN_WHEEL was missing. Further,
> > BTN_GEAR_UP had a space in its name and no Btn, which is against convention.
> > This makes the names BtnGearDown, BtnGearUp, and BtnWheel, fixing the errors
> > and matching convention.
> > 
> > Signed-off-by: Vicki Pfau <vi@endrift.com>
> 
> Applied to hid.git#for-6.16/upstream-fixes. Thanks,

Too quick. This breaks the build.

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",
      |                           ^~~~~~~~~~~~~
1 error generated.


Please, guys, always test your builds with `make W=1` (when CONFIG_WERROR is
not dropped) and with GCC and clang.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] HID: Fix debug name for BTN_GEAR_DOWN, BTN_GEAR_UP, BTN_WHEEL

[Andy Shevchenko]

On Tue, Jul 01, 2025 at 08:46:42PM -0700, Vicki Pfau wrote:
> The name of BTN_GEAR_DOWN was WheelBtn and BTN_WHEEL was missing.

Not true. Please, read code better.

> Further,
> BTN_GEAR_UP had a space in its name and no Btn, which is against convention.
> This makes the names BtnGearDown, BtnGearUp, and BtnWheel, fixing the errors
> and matching convention.

-- 
With Best Regards,
Andy Shevchenko