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>

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index d5abfe652fb5064c318d3ab016d5e6e7947fce8b..541d682af15aa2554659e54927244cecdd41914a 100644 (file)
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -3309,9 +3309,9 @@ static const char *keys[KEY_MAX + 1] = {
        [KEY_EPG] = "EPG",                      [KEY_PVR] = "PVR",
        [KEY_MHP] = "MHP",                      [KEY_LANGUAGE] = "Language",
        [KEY_TITLE] = "Title",                  [KEY_SUBTITLE] = "Subtitle",
-       [KEY_ANGLE] = "Angle",                  [KEY_ZOOM] = "Zoom",
+       [KEY_ANGLE] = "Angle",
        [KEY_MODE] = "Mode",                    [KEY_KEYBOARD] = "Keyboard",
-       [KEY_SCREEN] = "Screen",                [KEY_PC] = "PC",
+       [KEY_PC] = "PC",
        [KEY_TV] = "TV",                        [KEY_TV2] = "TV2",
        [KEY_VCR] = "VCR",                      [KEY_VCR2] = "VCR2",
        [KEY_SAT] = "Sat",                      [KEY_SAT2] = "Sat2",
@@ -3409,8 +3409,7 @@ static const char *keys[KEY_MAX + 1] = {
        [BTN_TRIGGER_HAPPY35] = "TriggerHappy35", [BTN_TRIGGER_HAPPY36] = "TriggerHappy36",
        [BTN_TRIGGER_HAPPY37] = "TriggerHappy37", [BTN_TRIGGER_HAPPY38] = "TriggerHappy38",
        [BTN_TRIGGER_HAPPY39] = "TriggerHappy39", [BTN_TRIGGER_HAPPY40] = "TriggerHappy40",
-       [BTN_DIGI] = "Digi",                    [BTN_STYLUS3] = "Stylus3",
-       [BTN_TOOL_QUINTTAP] = "ToolQuintTap",   [BTN_WHEEL] = "Wheel",
+       [BTN_STYLUS3] = "Stylus3",               [BTN_TOOL_QUINTTAP] = "ToolQuintTap",
        [KEY_10CHANNELSDOWN] = "10ChannelsDown",
        [KEY_10CHANNELSUP] = "10ChannelsUp",
        [KEY_3D_MODE] = "3DMode",               [KEY_ADDRESSBOOK] = "Addressbook",
@@ -3440,7 +3439,7 @@ static const char *keys[KEY_MAX + 1] = {
        [KEY_FN_RIGHT_SHIFT] = "FnRightShift",  [KEY_FRAMEBACK] = "FrameBack",
        [KEY_FRAMEFORWARD] = "FrameForward",    [KEY_FULL_SCREEN] = "FullScreen",
        [KEY_GAMES] = "Games",                  [KEY_GRAPHICSEDITOR] = "GraphicsEditor",
-       [KEY_HANGEUL] = "HanGeul",              [KEY_HANGUP_PHONE] = "HangUpPhone",
+       [KEY_HANGUP_PHONE] = "HangUpPhone",
        [KEY_IMAGES] = "Images",                [KEY_KBD_LCD_MENU1] = "KbdLcdMenu1",
        [KEY_KBD_LCD_MENU2] = "KbdLcdMenu2",    [KEY_KBD_LCD_MENU3] = "KbdLcdMenu3",
        [KEY_KBD_LCD_MENU4] = "KbdLcdMenu4",    [KEY_KBD_LCD_MENU5] = "KbdLcdMenu5",