HID: consolidate MacbookAir 4,1 mappings
authorJiri Kosina <jkosina@suse.cz>
Wed, 5 Oct 2011 14:54:45 +0000 (16:54 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 5 Oct 2011 14:54:45 +0000 (16:54 +0200)
MacbookAir 4,1 doesn't require extra mapping table, as the mappings
are identical to apple_fn_keys[].

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-apple.c

index b33bab9b72a5b90fdbd3e379a58e32112ede9367..4674556dcf5c886d115311e1cac3a4c796bec2ad 100644 (file)
@@ -82,28 +82,6 @@ static const struct apple_key_translation macbookair_fn_keys[] = {
        { }
 };
 
-static const struct apple_key_translation macbookair4_fn_keys[] = {
-       { KEY_BACKSPACE, KEY_DELETE },
-       { KEY_ENTER,    KEY_INSERT },
-       { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
-       { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
-       { KEY_F3,       KEY_SCALE,          APPLE_FLAG_FKEY },
-       { KEY_F4,       KEY_DASHBOARD,      APPLE_FLAG_FKEY },
-       { KEY_F5,       KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },
-       { KEY_F6,       KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },
-       { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
-       { KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
-       { KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
-       { KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
-       { KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
-       { KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
-       { KEY_UP,       KEY_PAGEUP },
-       { KEY_DOWN,     KEY_PAGEDOWN },
-       { KEY_LEFT,     KEY_HOME },
-       { KEY_RIGHT,    KEY_END },
-       { }
-};
-
 static const struct apple_key_translation apple_fn_keys[] = {
        { KEY_BACKSPACE, KEY_DELETE },
        { KEY_ENTER,    KEY_INSERT },
@@ -208,9 +186,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI &&
                                hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS)
                        table = macbookair_fn_keys;
-               else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI &&
-                               hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS)
-                       table = macbookair4_fn_keys;
                else if (hid->product < 0x21d || hid->product >= 0x300)
                        table = powerbook_fn_keys;
                else