Revert "Input: introduce BTN/ABS bits for drums and guitars"

This reverts commits 61e00655e9cb, 73f8645db191 and 8e22ecb603c8:
  "Input: introduce BTN/ABS bits for drums and guitars"
  "HID: wiimote: add support for Guitar-Hero drums"
  "HID: wiimote: add support for Guitar-Hero guitars"

The extra new ABS_xx values resulted in ABS_MAX no longer being a
power-of-two, which broke the comparison logic.  It also caused the
ioctl numbers to overflow into the next byte, causing problems for that.

We'll try again for 3.13.

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 14 deletions

diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index bd2bc4a1f378..abb20db2b443 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -455,12 +455,6 @@ static __u8 wiimote_cmd_read_ext(struct wiimote_data *wdata, __u8 *rmem)
                 return WIIMOTE_EXT_BALANCE_BOARD;
         if (rmem[4] == 0x01 && rmem[5] == 0x20)
                 return WIIMOTE_EXT_PRO_CONTROLLER;
-        if (rmem[0] == 0x01 && rmem[1] == 0x00 &&
-            rmem[4] == 0x01 && rmem[5] == 0x03)
-                return WIIMOTE_EXT_GUITAR_HERO_DRUMS;
-        if (rmem[0] == 0x00 && rmem[1] == 0x00 &&
-            rmem[4] == 0x01 && rmem[5] == 0x03)
-                return WIIMOTE_EXT_GUITAR_HERO_GUITAR;
 
         return WIIMOTE_EXT_UNKNOWN;
 }
@@ -494,8 +488,6 @@ static bool wiimote_cmd_map_mp(struct wiimote_data *wdata, __u8 exttype)
         /* map MP with correct pass-through mode */
         switch (exttype) {
         case WIIMOTE_EXT_CLASSIC_CONTROLLER:
-        case WIIMOTE_EXT_GUITAR_HERO_DRUMS:
-        case WIIMOTE_EXT_GUITAR_HERO_GUITAR:
                 wmem = 0x07;
                 break;
         case WIIMOTE_EXT_NUNCHUK:
@@ -1083,8 +1075,6 @@ static const char *wiimote_exttype_names[WIIMOTE_EXT_NUM] = {
         [WIIMOTE_EXT_CLASSIC_CONTROLLER] = "Nintendo Wii Classic Controller",
         [WIIMOTE_EXT_BALANCE_BOARD] = "Nintendo Wii Balance Board",
         [WIIMOTE_EXT_PRO_CONTROLLER] = "Nintendo Wii U Pro Controller",
-        [WIIMOTE_EXT_GUITAR_HERO_DRUMS] = "Nintendo Wii Guitar Hero Drums",
-        [WIIMOTE_EXT_GUITAR_HERO_GUITAR] = "Nintendo Wii Guitar Hero Guitar",
 };
 
 /*
@@ -1670,10 +1660,6 @@ static ssize_t wiimote_ext_show(struct device *dev,
                 return sprintf(buf, "balanceboard\n");
         case WIIMOTE_EXT_PRO_CONTROLLER:
                 return sprintf(buf, "procontroller\n");
-        case WIIMOTE_EXT_GUITAR_HERO_DRUMS:
-                return sprintf(buf, "drums\n");
-        case WIIMOTE_EXT_GUITAR_HERO_GUITAR:
-                return sprintf(buf, "guitar\n");
         case WIIMOTE_EXT_UNKNOWN:
                 /* fallthrough */
         default: