Skip to content

Commit 7b2daa6

Browse files
andy-shevJiri Kosina
authored andcommitted
HID: debug: Remove duplicates from 'keys'
Duplicates in 'keys prevents kernel builds with clang, `make W=1` and CONFIG_WERROR=y, for example: drivers/hid/hid-debug.c:3443:18: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides] 3443 | [KEY_HANGEUL] = "HanGeul", [KEY_HANGUP_PHONE] = "HangUpPhone", | ^~~~~~~~~ drivers/hid/hid-debug.c:3217:18: note: previous initialization is here 3217 | [KEY_HANGUEL] = "Hangeul", [KEY_HANJA] = "Hanja", | ^~~~~~~~~ Fix this by removing them. The logic of removal is that, remove... 1) if there is a constant that uses another defined constant, OR 2) the one that appears later in the list. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent b2b8a75 commit 7b2daa6

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

drivers/hid/hid-debug.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3309,9 +3309,9 @@ static const char *keys[KEY_MAX + 1] = {
33093309
[KEY_EPG] = "EPG", [KEY_PVR] = "PVR",
33103310
[KEY_MHP] = "MHP", [KEY_LANGUAGE] = "Language",
33113311
[KEY_TITLE] = "Title", [KEY_SUBTITLE] = "Subtitle",
3312-
[KEY_ANGLE] = "Angle", [KEY_ZOOM] = "Zoom",
3312+
[KEY_ANGLE] = "Angle",
33133313
[KEY_MODE] = "Mode", [KEY_KEYBOARD] = "Keyboard",
3314-
[KEY_SCREEN] = "Screen", [KEY_PC] = "PC",
3314+
[KEY_PC] = "PC",
33153315
[KEY_TV] = "TV", [KEY_TV2] = "TV2",
33163316
[KEY_VCR] = "VCR", [KEY_VCR2] = "VCR2",
33173317
[KEY_SAT] = "Sat", [KEY_SAT2] = "Sat2",
@@ -3409,8 +3409,7 @@ static const char *keys[KEY_MAX + 1] = {
34093409
[BTN_TRIGGER_HAPPY35] = "TriggerHappy35", [BTN_TRIGGER_HAPPY36] = "TriggerHappy36",
34103410
[BTN_TRIGGER_HAPPY37] = "TriggerHappy37", [BTN_TRIGGER_HAPPY38] = "TriggerHappy38",
34113411
[BTN_TRIGGER_HAPPY39] = "TriggerHappy39", [BTN_TRIGGER_HAPPY40] = "TriggerHappy40",
3412-
[BTN_DIGI] = "Digi", [BTN_STYLUS3] = "Stylus3",
3413-
[BTN_TOOL_QUINTTAP] = "ToolQuintTap", [BTN_WHEEL] = "Wheel",
3412+
[BTN_STYLUS3] = "Stylus3", [BTN_TOOL_QUINTTAP] = "ToolQuintTap",
34143413
[KEY_10CHANNELSDOWN] = "10ChannelsDown",
34153414
[KEY_10CHANNELSUP] = "10ChannelsUp",
34163415
[KEY_3D_MODE] = "3DMode", [KEY_ADDRESSBOOK] = "Addressbook",
@@ -3440,7 +3439,7 @@ static const char *keys[KEY_MAX + 1] = {
34403439
[KEY_FN_RIGHT_SHIFT] = "FnRightShift", [KEY_FRAMEBACK] = "FrameBack",
34413440
[KEY_FRAMEFORWARD] = "FrameForward", [KEY_FULL_SCREEN] = "FullScreen",
34423441
[KEY_GAMES] = "Games", [KEY_GRAPHICSEDITOR] = "GraphicsEditor",
3443-
[KEY_HANGEUL] = "HanGeul", [KEY_HANGUP_PHONE] = "HangUpPhone",
3442+
[KEY_HANGUP_PHONE] = "HangUpPhone",
34443443
[KEY_IMAGES] = "Images", [KEY_KBD_LCD_MENU1] = "KbdLcdMenu1",
34453444
[KEY_KBD_LCD_MENU2] = "KbdLcdMenu2", [KEY_KBD_LCD_MENU3] = "KbdLcdMenu3",
34463445
[KEY_KBD_LCD_MENU4] = "KbdLcdMenu4", [KEY_KBD_LCD_MENU5] = "KbdLcdMenu5",

0 commit comments

Comments
 (0)