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, 2 insertions, 23 deletions

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index 76457eef172a..d584047b072b 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -716,14 +716,6 @@ struct input_keymap_entry {
 #define BTN_DPAD_LEFT           0x222
 #define BTN_DPAD_RIGHT          0x223
 
-#define BTN_FRET_FAR_UP         0x224
-#define BTN_FRET_UP             0x225
-#define BTN_FRET_MID            0x226
-#define BTN_FRET_LOW            0x227
-#define BTN_FRET_FAR_LOW        0x228
-#define BTN_STRUM_BAR_UP        0x229
-#define BTN_STRUM_BAR_DOWN      0x22a
-
 #define BTN_TRIGGER_HAPPY               0x2c0
 #define BTN_TRIGGER_HAPPY1              0x2c0
 #define BTN_TRIGGER_HAPPY2              0x2c1
@@ -837,21 +829,8 @@ struct input_keymap_entry {
 #define ABS_MT_TOOL_X           0x3c    /* Center X tool position */
 #define ABS_MT_TOOL_Y           0x3d    /* Center Y tool position */
 
-/* Drums and guitars (mostly toys) */
-#define ABS_TOM_FAR_LEFT        0x40
-#define ABS_TOM_LEFT            0x41
-#define ABS_TOM_RIGHT           0x42
-#define ABS_TOM_FAR_RIGHT       0x43
-#define ABS_CYMBAL_FAR_LEFT     0x44
-#define ABS_CYMBAL_LEFT         0x45
-#define ABS_CYMBAL_RIGHT        0x46
-#define ABS_CYMBAL_FAR_RIGHT    0x47
-#define ABS_BASS                0x48
-#define ABS_HI_HAT              0x49
-#define ABS_FRET_BOARD          0x4a    /* Guitar fret board, vertical pos */
-#define ABS_WHAMMY_BAR          0x4b    /* Guitar whammy bar (or vibrato) */
-
-#define ABS_MAX                 0x4f
+
+#define ABS_MAX                 0x3f
 #define ABS_CNT                 (ABS_MAX+1)
 
 /*