Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git] / drivers / usb / input / hid-input.c
index 042c6d4..2ae4fb9 100644 (file)
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/input.h>
-#include <linux/usb.h>
+#include <linux/usb/input.h>
+
+#undef DEBUG
 
 #include "hid.h"
 
 #define unk    KEY_UNKNOWN
 
-static unsigned char hid_keyboard[256] = {
+static const unsigned char hid_keyboard[256] = {
          0,  0,  0,  0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38,
         50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44,  2,  3,
          4,  5,  6,  7,  8,  9, 10, 11, 28,  1, 14, 15, 57, 12, 13, 26,
@@ -55,77 +56,260 @@ static unsigned char hid_keyboard[256] = {
        150,158,159,128,136,177,178,176,142,152,173,140,unk,unk,unk,unk
 };
 
-static struct {
+static const struct {
        __s32 x;
        __s32 y;
 }  hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}};
 
-static struct input_dev *find_input(struct hid_device *hid, struct hid_field *field)
+#define map_abs(c)     do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX; } while (0)
+#define map_rel(c)     do { usage->code = c; usage->type = EV_REL; bit = input->relbit; max = REL_MAX; } while (0)
+#define map_key(c)     do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX; } while (0)
+#define map_led(c)     do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; max = LED_MAX; } while (0)
+#define map_ff(c)      do { usage->code = c; usage->type = EV_FF;  bit = input->ffbit;  max =  FF_MAX; } while (0)
+
+#define map_abs_clear(c)       do { map_abs(c); clear_bit(c, bit); } while (0)
+#define map_key_clear(c)       do { map_key(c); clear_bit(c, bit); } while (0)
+#define map_ff_effect(c)       do { set_bit(c, input->ffbit); } while (0)
+
+#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
+
+struct hidinput_key_translation {
+       u16 from;
+       u16 to;
+       u8 flags;
+};
+
+#define POWERBOOK_FLAG_FKEY 0x01
+
+static struct hidinput_key_translation powerbook_fn_keys[] = {
+       { KEY_BACKSPACE, KEY_DELETE },
+       { KEY_F1,       KEY_BRIGHTNESSDOWN,     POWERBOOK_FLAG_FKEY },
+       { KEY_F2,       KEY_BRIGHTNESSUP,       POWERBOOK_FLAG_FKEY },
+       { KEY_F3,       KEY_MUTE,               POWERBOOK_FLAG_FKEY },
+       { KEY_F4,       KEY_VOLUMEDOWN,         POWERBOOK_FLAG_FKEY },
+       { KEY_F5,       KEY_VOLUMEUP,           POWERBOOK_FLAG_FKEY },
+       { KEY_F6,       KEY_NUMLOCK,            POWERBOOK_FLAG_FKEY },
+       { KEY_F7,       KEY_SWITCHVIDEOMODE,    POWERBOOK_FLAG_FKEY },
+       { KEY_F8,       KEY_KBDILLUMTOGGLE,     POWERBOOK_FLAG_FKEY },
+       { KEY_F9,       KEY_KBDILLUMDOWN,       POWERBOOK_FLAG_FKEY },
+       { KEY_F10,      KEY_KBDILLUMUP,         POWERBOOK_FLAG_FKEY },
+       { KEY_UP,       KEY_PAGEUP },
+       { KEY_DOWN,     KEY_PAGEDOWN },
+       { KEY_LEFT,     KEY_HOME },
+       { KEY_RIGHT,    KEY_END },
+       { }
+};
+
+static struct hidinput_key_translation powerbook_numlock_keys[] = {
+       { KEY_J,        KEY_KP1 },
+       { KEY_K,        KEY_KP2 },
+       { KEY_L,        KEY_KP3 },
+       { KEY_U,        KEY_KP4 },
+       { KEY_I,        KEY_KP5 },
+       { KEY_O,        KEY_KP6 },
+       { KEY_7,        KEY_KP7 },
+       { KEY_8,        KEY_KP8 },
+       { KEY_9,        KEY_KP9 },
+       { KEY_M,        KEY_KP0 },
+       { KEY_DOT,      KEY_KPDOT },
+       { KEY_SLASH,    KEY_KPPLUS },
+       { KEY_SEMICOLON, KEY_KPMINUS },
+       { KEY_P,        KEY_KPASTERISK },
+       { KEY_MINUS,    KEY_KPEQUAL },
+       { KEY_0,        KEY_KPSLASH },
+       { KEY_F6,       KEY_NUMLOCK },
+       { KEY_KPENTER,  KEY_KPENTER },
+       { KEY_BACKSPACE, KEY_BACKSPACE },
+       { }
+};
+
+static struct hidinput_key_translation powerbook_iso_keyboard[] = {
+       { KEY_GRAVE,    KEY_102ND },
+       { KEY_102ND,    KEY_GRAVE },
+       { }
+};
+
+static int usbhid_pb_fnmode = 1;
+module_param_named(pb_fnmode, usbhid_pb_fnmode, int, 0644);
+MODULE_PARM_DESC(pb_fnmode,
+       "Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");
+
+static struct hidinput_key_translation *find_translation(struct hidinput_key_translation *table, u16 from)
 {
-       struct list_head *lh;
-       struct hid_input *hidinput;
+       struct hidinput_key_translation *trans;
 
-       list_for_each (lh, &hid->inputs) {
-               int i;
+       /* Look for the translation */
+       for (trans = table; trans->from; trans++)
+               if (trans->from == from)
+                       return trans;
 
-               hidinput = list_entry(lh, struct hid_input, list);
+       return NULL;
+}
 
-               if (! hidinput->report)
-                       continue;
+static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,
+                            struct hid_usage *usage, __s32 value)
+{
+       struct hidinput_key_translation *trans;
 
-               for (i = 0; i < hidinput->report->maxfield; i++)
-                       if (hidinput->report->field[i] == field)
-                               return &hidinput->input;
+       if (usage->code == KEY_FN) {
+               if (value) hid->quirks |=  HID_QUIRK_POWERBOOK_FN_ON;
+               else       hid->quirks &= ~HID_QUIRK_POWERBOOK_FN_ON;
+
+               input_event(input, usage->type, usage->code, value);
+
+               return 1;
        }
 
-       /* Assume we only have one input and use it */
-       if (!list_empty(&hid->inputs)) {
-               hidinput = list_entry(hid->inputs.next, struct hid_input, list);
-               return &hidinput->input;
+       if (usbhid_pb_fnmode) {
+               int do_translate;
+
+               trans = find_translation(powerbook_fn_keys, usage->code);
+               if (trans) {
+                       if (test_bit(usage->code, hid->pb_pressed_fn))
+                               do_translate = 1;
+                       else if (trans->flags & POWERBOOK_FLAG_FKEY)
+                               do_translate =
+                                       (usbhid_pb_fnmode == 2 &&  (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON)) ||
+                                       (usbhid_pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));
+                       else
+                               do_translate = (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON);
+
+                       if (do_translate) {
+                               if (value)
+                                       set_bit(usage->code, hid->pb_pressed_fn);
+                               else
+                                       clear_bit(usage->code, hid->pb_pressed_fn);
+
+                               input_event(input, usage->type, trans->to, value);
+
+                               return 1;
+                       }
+               }
+
+               if (test_bit(usage->code, hid->pb_pressed_numlock) ||
+                   test_bit(LED_NUML, input->led)) {
+                       trans = find_translation(powerbook_numlock_keys, usage->code);
+
+                       if (trans) {
+                               if (value)
+                                       set_bit(usage->code, hid->pb_pressed_numlock);
+                               else
+                                       clear_bit(usage->code, hid->pb_pressed_numlock);
+
+                               input_event(input, usage->type, trans->to, value);
+                       }
+
+                       return 1;
+               }
        }
 
-       /* This is really a bug */
-       return NULL;
+       if (hid->quirks & HID_QUIRK_POWERBOOK_ISO_KEYBOARD) {
+               trans = find_translation(powerbook_iso_keyboard, usage->code);
+               if (trans) {
+                       input_event(input, usage->type, trans->to, value);
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+static void hidinput_pb_setup(struct input_dev *input)
+{
+       struct hidinput_key_translation *trans;
+
+       set_bit(KEY_NUMLOCK, input->keybit);
+
+       /* Enable all needed keys */
+       for (trans = powerbook_fn_keys; trans->from; trans++)
+               set_bit(trans->to, input->keybit);
+
+       for (trans = powerbook_numlock_keys; trans->from; trans++)
+               set_bit(trans->to, input->keybit);
+
+       for (trans = powerbook_iso_keyboard; trans->from; trans++)
+               set_bit(trans->to, input->keybit);
+}
+#else
+static inline int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,
+                                   struct hid_usage *usage, __s32 value)
+{
+       return 0;
+}
+
+static inline void hidinput_pb_setup(struct input_dev *input)
+{
 }
+#endif
 
 static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_field *field,
                                     struct hid_usage *usage)
 {
-       struct input_dev *input = &hidinput->input;
-       struct hid_device *device = hidinput->input.private;
-       int max;
-       int is_abs = 0;
-       unsigned long *bit;
+       struct input_dev *input = hidinput->input;
+       struct hid_device *device = input->private;
+       int max = 0, code;
+       unsigned long *bit = NULL;
+
+       field->hidinput = hidinput;
+
+#ifdef DEBUG
+       printk(KERN_DEBUG "Mapping: ");
+       resolv_usage(usage->hid);
+       printk(" ---> ");
+#endif
+
+       if (field->flags & HID_MAIN_ITEM_CONSTANT)
+               goto ignore;
 
        switch (usage->hid & HID_USAGE_PAGE) {
 
+               case HID_UP_UNDEFINED:
+                       goto ignore;
+
                case HID_UP_KEYBOARD:
 
                        set_bit(EV_REP, input->evbit);
-                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
 
                        if ((usage->hid & HID_USAGE) < 256) {
-                               if (!(usage->code = hid_keyboard[usage->hid & HID_USAGE]))
-                                       return;
-                               clear_bit(usage->code, bit);
+                               if (!hid_keyboard[usage->hid & HID_USAGE]) goto ignore;
+                               map_key_clear(hid_keyboard[usage->hid & HID_USAGE]);
                        } else
-                               usage->code = KEY_UNKNOWN;
+                               map_key(KEY_UNKNOWN);
 
                        break;
 
                case HID_UP_BUTTON:
 
-                       usage->code = ((usage->hid - 1) & 0xf) + 0x100;
-                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
+                       code = ((usage->hid - 1) & 0xf);
 
                        switch (field->application) {
-                               case HID_GD_GAMEPAD:  usage->code += 0x10;
-                               case HID_GD_JOYSTICK: usage->code += 0x10;
-                               case HID_GD_MOUSE:    usage->code += 0x10; break;
+                               case HID_GD_MOUSE:
+                               case HID_GD_POINTER:  code += 0x110; break;
+                               case HID_GD_JOYSTICK: code += 0x120; break;
+                               case HID_GD_GAMEPAD:  code += 0x130; break;
                                default:
-                                       if (field->physical == HID_GD_POINTER)
-                                               usage->code += 0x10;
-                                       break;
+                                       switch (field->physical) {
+                                               case HID_GD_MOUSE:
+                                               case HID_GD_POINTER:  code += 0x110; break;
+                                               case HID_GD_JOYSTICK: code += 0x120; break;
+                                               case HID_GD_GAMEPAD:  code += 0x130; break;
+                                               default:              code += 0x100;
+                                       }
+                       }
+
+                       map_key(code);
+                       break;
+
+
+               case HID_UP_SIMULATION:
+
+                       switch (usage->hid & 0xffff) {
+                               case 0xba: map_abs(ABS_RUDDER);   break;
+                               case 0xbb: map_abs(ABS_THROTTLE); break;
+                               case 0xc4: map_abs(ABS_GAS);      break;
+                               case 0xc5: map_abs(ABS_BRAKE);    break;
+                               case 0xc8: map_abs(ABS_WHEEL);    break;
+                               default:   goto ignore;
                        }
                        break;
 
@@ -133,41 +317,60 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
                        if ((usage->hid & 0xf0) == 0x80) {      /* SystemControl */
                                switch (usage->hid & 0xf) {
-                                       case 0x1: usage->code = KEY_POWER;  break;
-                                       case 0x2: usage->code = KEY_SLEEP;  break;
-                                       case 0x3: usage->code = KEY_WAKEUP; break;
-                                       default: usage->code = KEY_UNKNOWN; break;
+                                       case 0x1: map_key_clear(KEY_POWER);  break;
+                                       case 0x2: map_key_clear(KEY_SLEEP);  break;
+                                       case 0x3: map_key_clear(KEY_WAKEUP); break;
+                                       default: goto unknown;
                                }
-                               usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
                                break;
                        }
 
-                       usage->code = usage->hid & 0xf;
-
-                       if (field->report_size == 1) {
-                               usage->code = BTN_MISC;
-                               usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
+                       if ((usage->hid & 0xf0) == 0x90) {      /* D-pad */
+                               switch (usage->hid) {
+                                       case HID_GD_UP:    usage->hat_dir = 1; break;
+                                       case HID_GD_DOWN:  usage->hat_dir = 5; break;
+                                       case HID_GD_RIGHT: usage->hat_dir = 3; break;
+                                       case HID_GD_LEFT:  usage->hat_dir = 7; break;
+                                       default: goto unknown;
+                               }
+                               if (field->dpad) {
+                                       map_abs(field->dpad);
+                                       goto ignore;
+                               }
+                               map_abs(ABS_HAT0X);
                                break;
                        }
 
-                       if (field->flags & HID_MAIN_ITEM_RELATIVE) {
-                               usage->type = EV_REL; bit = input->relbit; max = REL_MAX;
-                               break;
-                       }
+                       switch (usage->hid) {
+
+                               /* These usage IDs map directly to the usage codes. */
+                               case HID_GD_X: case HID_GD_Y: case HID_GD_Z:
+                               case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
+                               case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
+                                       if (field->flags & HID_MAIN_ITEM_RELATIVE)
+                                               map_rel(usage->hid & 0xf);
+                                       else
+                                               map_abs(usage->hid & 0xf);
+                                       break;
+
+                               case HID_GD_HATSWITCH:
+                                       usage->hat_min = field->logical_minimum;
+                                       usage->hat_max = field->logical_maximum;
+                                       map_abs(ABS_HAT0X);
+                                       break;
 
-                       usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX;
+                               case HID_GD_START:      map_key_clear(BTN_START);       break;
+                               case HID_GD_SELECT:     map_key_clear(BTN_SELECT);      break;
 
-                       if (usage->hid == HID_GD_HATSWITCH) {
-                               usage->code = ABS_HAT0X;
-                               usage->hat_min = field->logical_minimum;
-                               usage->hat_max = field->logical_maximum;
+                               default: goto unknown;
                        }
+
                        break;
 
                case HID_UP_LED:
-
-                       usage->code = (usage->hid - 1) & 0xf;
-                       usage->type = EV_LED; bit = input->ledbit; max = LED_MAX;
+                       if (((usage->hid - 1) & 0xffff) >= LED_MAX)
+                               goto ignore;
+                       map_led((usage->hid - 1) & 0xffff);
                        break;
 
                case HID_UP_DIGITIZER:
@@ -175,49 +378,36 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        switch (usage->hid & 0xff) {
 
                                case 0x30: /* TipPressure */
-
                                        if (!test_bit(BTN_TOUCH, input->keybit)) {
                                                device->quirks |= HID_QUIRK_NOTOUCH;
                                                set_bit(EV_KEY, input->evbit);
                                                set_bit(BTN_TOUCH, input->keybit);
                                        }
-                                       usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX;
-                                       usage->code = ABS_PRESSURE;
-                                       clear_bit(usage->code, bit);
+
+                                       map_abs_clear(ABS_PRESSURE);
                                        break;
 
                                case 0x32: /* InRange */
-
-                                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
                                        switch (field->physical & 0xff) {
-                                               case 0x21: usage->code = BTN_TOOL_MOUSE; break;
-                                               case 0x22: usage->code = BTN_TOOL_FINGER; break;
-                                               default: usage->code = BTN_TOOL_PEN; break;
+                                               case 0x21: map_key(BTN_TOOL_MOUSE); break;
+                                               case 0x22: map_key(BTN_TOOL_FINGER); break;
+                                               default: map_key(BTN_TOOL_PEN); break;
                                        }
                                        break;
 
                                case 0x3c: /* Invert */
-
-                                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
-                                       usage->code = BTN_TOOL_RUBBER;
-                                       clear_bit(usage->code, bit);
+                                       map_key_clear(BTN_TOOL_RUBBER);
                                        break;
 
                                case 0x33: /* Touch */
                                case 0x42: /* TipSwitch */
                                case 0x43: /* TipSwitch2 */
-
                                        device->quirks &= ~HID_QUIRK_NOTOUCH;
-                                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
-                                       usage->code = BTN_TOUCH;
-                                       clear_bit(usage->code, bit);
+                                       map_key_clear(BTN_TOUCH);
                                        break;
 
                                case 0x44: /* BarrelSwitch */
-
-                                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
-                                       usage->code = BTN_STYLUS;
-                                       clear_bit(usage->code, bit);
+                                       map_key_clear(BTN_STYLUS);
                                        break;
 
                                default:  goto unknown;
@@ -226,56 +416,65 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
                case HID_UP_CONSUMER:   /* USB HUT v1.1, pages 56-62 */
 
-                       set_bit(EV_REP, input->evbit);
                        switch (usage->hid & HID_USAGE) {
-                               case 0x000: usage->code = 0; break;
-                               case 0x034: usage->code = KEY_SLEEP;            break;
-                               case 0x036: usage->code = BTN_MISC;             break;
-                               case 0x08a: usage->code = KEY_WWW;              break;
-                               case 0x095: usage->code = KEY_HELP;             break;
-
-                               case 0x0b0: usage->code = KEY_PLAY;             break;
-                               case 0x0b1: usage->code = KEY_PAUSE;            break;
-                               case 0x0b2: usage->code = KEY_RECORD;           break;
-                               case 0x0b3: usage->code = KEY_FASTFORWARD;      break;
-                               case 0x0b4: usage->code = KEY_REWIND;           break;
-                               case 0x0b5: usage->code = KEY_NEXTSONG;         break;
-                               case 0x0b6: usage->code = KEY_PREVIOUSSONG;     break;
-                               case 0x0b7: usage->code = KEY_STOPCD;           break;
-                               case 0x0b8: usage->code = KEY_EJECTCD;          break;
-                               case 0x0cd: usage->code = KEY_PLAYPAUSE;        break;
-                               case 0x0e0: is_abs = 1;
-                                           usage->code = ABS_VOLUME;
-                                           break;
-                               case 0x0e2: usage->code = KEY_MUTE;             break;
-                               case 0x0e5: usage->code = KEY_BASSBOOST;        break;
-                               case 0x0e9: usage->code = KEY_VOLUMEUP;         break;
-                               case 0x0ea: usage->code = KEY_VOLUMEDOWN;       break;
-
-                               case 0x183: usage->code = KEY_CONFIG;           break;
-                               case 0x18a: usage->code = KEY_MAIL;             break;
-                               case 0x192: usage->code = KEY_CALC;             break;
-                               case 0x194: usage->code = KEY_FILE;             break;
-                               case 0x21a: usage->code = KEY_UNDO;             break;
-                               case 0x21b: usage->code = KEY_COPY;             break;
-                               case 0x21c: usage->code = KEY_CUT;              break;
-                               case 0x21d: usage->code = KEY_PASTE;            break;
-
-                               case 0x221: usage->code = KEY_FIND;             break;
-                               case 0x223: usage->code = KEY_HOMEPAGE;         break;
-                               case 0x224: usage->code = KEY_BACK;             break;
-                               case 0x225: usage->code = KEY_FORWARD;          break;
-                               case 0x226: usage->code = KEY_STOP;             break;
-                               case 0x227: usage->code = KEY_REFRESH;          break;
-                               case 0x22a: usage->code = KEY_BOOKMARKS;        break;
-
-                               default:    usage->code = KEY_UNKNOWN;          break;
-                       }
-
-                       if (is_abs) {
-                               usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX;
-                       } else  {
-                               usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
+                               case 0x000: goto ignore;
+                               case 0x034: map_key_clear(KEY_SLEEP);           break;
+                               case 0x036: map_key_clear(BTN_MISC);            break;
+                               case 0x045: map_key_clear(KEY_RADIO);           break;
+                               case 0x08a: map_key_clear(KEY_WWW);             break;
+                               case 0x08d: map_key_clear(KEY_PROGRAM);         break;
+                               case 0x095: map_key_clear(KEY_HELP);            break;
+                               case 0x09c: map_key_clear(KEY_CHANNELUP);       break;
+                               case 0x09d: map_key_clear(KEY_CHANNELDOWN);     break;
+                               case 0x0b0: map_key_clear(KEY_PLAY);            break;
+                               case 0x0b1: map_key_clear(KEY_PAUSE);           break;
+                               case 0x0b2: map_key_clear(KEY_RECORD);          break;
+                               case 0x0b3: map_key_clear(KEY_FASTFORWARD);     break;
+                               case 0x0b4: map_key_clear(KEY_REWIND);          break;
+                               case 0x0b5: map_key_clear(KEY_NEXTSONG);        break;
+                               case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);    break;
+                               case 0x0b7: map_key_clear(KEY_STOPCD);          break;
+                               case 0x0b8: map_key_clear(KEY_EJECTCD);         break;
+                               case 0x0cd: map_key_clear(KEY_PLAYPAUSE);       break;
+                               case 0x0e0: map_abs_clear(ABS_VOLUME);          break;
+                               case 0x0e2: map_key_clear(KEY_MUTE);            break;
+                               case 0x0e5: map_key_clear(KEY_BASSBOOST);       break;
+                               case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
+                               case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
+                               case 0x183: map_key_clear(KEY_CONFIG);          break;
+                               case 0x18a: map_key_clear(KEY_MAIL);            break;
+                               case 0x192: map_key_clear(KEY_CALC);            break;
+                               case 0x194: map_key_clear(KEY_FILE);            break;
+                               case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
+                               case 0x201: map_key_clear(KEY_NEW);             break;
+                               case 0x207: map_key_clear(KEY_SAVE);            break;
+                               case 0x208: map_key_clear(KEY_PRINT);           break;
+                               case 0x209: map_key_clear(KEY_PROPS);           break;
+                               case 0x21a: map_key_clear(KEY_UNDO);            break;
+                               case 0x21b: map_key_clear(KEY_COPY);            break;
+                               case 0x21c: map_key_clear(KEY_CUT);             break;
+                               case 0x21d: map_key_clear(KEY_PASTE);           break;
+                               case 0x221: map_key_clear(KEY_FIND);            break;
+                               case 0x223: map_key_clear(KEY_HOMEPAGE);        break;
+                               case 0x224: map_key_clear(KEY_BACK);            break;
+                               case 0x225: map_key_clear(KEY_FORWARD);         break;
+                               case 0x226: map_key_clear(KEY_STOP);            break;
+                               case 0x227: map_key_clear(KEY_REFRESH);         break;
+                               case 0x22a: map_key_clear(KEY_BOOKMARKS);       break;
+                               case 0x233: map_key_clear(KEY_SCROLLUP);        break;
+                               case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
+                               case 0x238: map_rel(REL_HWHEEL);                break;
+                               case 0x279: map_key_clear(KEY_REDO);            break;
+                               case 0x289: map_key_clear(KEY_REPLY);           break;
+                               case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
+                               case 0x28c: map_key_clear(KEY_SEND);            break;
+
+                               /* Reported on a Cherry Cymotion keyboard */
+                               case 0x301: map_key_clear(KEY_PROG1);           break;
+                               case 0x302: map_key_clear(KEY_PROG2);           break;
+                               case 0x303: map_key_clear(KEY_PROG3);           break;
+
+                               default:    goto ignore;
                        }
                        break;
 
@@ -283,114 +482,134 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
                        set_bit(EV_REP, input->evbit);
                        switch (usage->hid & HID_USAGE) {
-                               case 0x021: usage->code = KEY_PRINT;            break;
-                               case 0x070: usage->code = KEY_HP;               break;
-                               case 0x071: usage->code = KEY_CAMERA;           break;
-                               case 0x072: usage->code = KEY_SOUND;            break;
-                               case 0x073: usage->code = KEY_QUESTION;         break;
-
-                               case 0x080: usage->code = KEY_EMAIL;            break;
-                               case 0x081: usage->code = KEY_CHAT;             break;
-                               case 0x082: usage->code = KEY_SEARCH;           break;
-                               case 0x083: usage->code = KEY_CONNECT;          break;
-                               case 0x084: usage->code = KEY_FINANCE;          break;
-                               case 0x085: usage->code = KEY_SPORT;            break;
-                               case 0x086: usage->code = KEY_SHOP;             break;
-
-                               default:    usage->code = KEY_UNKNOWN;          break;
+                               case 0x021: map_key_clear(KEY_PRINT);           break;
+                               case 0x070: map_key_clear(KEY_HP);              break;
+                               case 0x071: map_key_clear(KEY_CAMERA);          break;
+                               case 0x072: map_key_clear(KEY_SOUND);           break;
+                               case 0x073: map_key_clear(KEY_QUESTION);        break;
+                               case 0x080: map_key_clear(KEY_EMAIL);           break;
+                               case 0x081: map_key_clear(KEY_CHAT);            break;
+                               case 0x082: map_key_clear(KEY_SEARCH);          break;
+                               case 0x083: map_key_clear(KEY_CONNECT);         break;
+                               case 0x084: map_key_clear(KEY_FINANCE);         break;
+                               case 0x085: map_key_clear(KEY_SPORT);           break;
+                               case 0x086: map_key_clear(KEY_SHOP);            break;
+                               default:    goto ignore;
+                       }
+                       break;
+
+               case HID_UP_MSVENDOR:
+                       goto ignore;
+
+               case HID_UP_CUSTOM: /* Reported on Logitech and Powerbook USB keyboards */
+
+                       set_bit(EV_REP, input->evbit);
+                       switch(usage->hid & HID_USAGE) {
+                               case 0x003:
+                                       /* The fn key on Apple PowerBooks */
+                                       map_key_clear(KEY_FN);
+                                       hidinput_pb_setup(input);
+                                       break;
 
+                               default:    goto ignore;
                        }
+                       break;
+
+               case HID_UP_LOGIVENDOR: /* Reported on Logitech Ultra X Media Remote */
 
-                       usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
+                       set_bit(EV_REP, input->evbit);
+                       switch(usage->hid & HID_USAGE) {
+                               case 0x004: map_key_clear(KEY_AGAIN);           break;
+                               case 0x00d: map_key_clear(KEY_HOME);            break;
+                               case 0x024: map_key_clear(KEY_SHUFFLE);         break;
+                               case 0x025: map_key_clear(KEY_TV);              break;
+                               case 0x026: map_key_clear(KEY_MENU);            break;
+                               case 0x031: map_key_clear(KEY_AUDIO);           break;
+                               case 0x032: map_key_clear(KEY_TEXT);            break;
+                               case 0x033: map_key_clear(KEY_LAST);            break;
+                               case 0x047: map_key_clear(KEY_MP3);             break;
+                               case 0x048: map_key_clear(KEY_DVD);             break;
+                               case 0x049: map_key_clear(KEY_MEDIA);           break;
+                               case 0x04a: map_key_clear(KEY_VIDEO);           break;
+                               case 0x04b: map_key_clear(KEY_ANGLE);           break;
+                               case 0x04c: map_key_clear(KEY_LANGUAGE);        break;
+                               case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
+                               case 0x051: map_key_clear(KEY_RED);             break;
+                               case 0x052: map_key_clear(KEY_CLOSE);           break;
+                               default:    goto ignore;
+                       }
                        break;
-                       
+
                case HID_UP_PID:
 
-                       usage->type = EV_FF; bit = input->ffbit; max = FF_MAX;
-                       
+                       set_bit(EV_FF, input->evbit);
                        switch(usage->hid & HID_USAGE) {
-                               case 0x26: set_bit(FF_CONSTANT, input->ffbit); break;
-                               case 0x27: set_bit(FF_RAMP,     input->ffbit); break;
-                               case 0x28: set_bit(FF_CUSTOM,   input->ffbit); break;
-                               case 0x30: set_bit(FF_SQUARE,   input->ffbit);
-                                          set_bit(FF_PERIODIC, input->ffbit); break;
-                               case 0x31: set_bit(FF_SINE,     input->ffbit);
-                                          set_bit(FF_PERIODIC, input->ffbit); break;
-                               case 0x32: set_bit(FF_TRIANGLE, input->ffbit);
-                                          set_bit(FF_PERIODIC, input->ffbit); break;
-                               case 0x33: set_bit(FF_SAW_UP,   input->ffbit);
-                                          set_bit(FF_PERIODIC, input->ffbit); break;
-                               case 0x34: set_bit(FF_SAW_DOWN, input->ffbit);
-                                          set_bit(FF_PERIODIC, input->ffbit); break;
-                               case 0x40: set_bit(FF_SPRING,   input->ffbit); break;
-                               case 0x41: set_bit(FF_DAMPER,   input->ffbit); break;
-                               case 0x42: set_bit(FF_INERTIA , input->ffbit); break;
-                               case 0x43: set_bit(FF_FRICTION, input->ffbit); break;
-                               case 0x7e: usage->code = FF_GAIN;       break;
-                               case 0x83:  /* Simultaneous Effects Max */
-                                       input->ff_effects_max = (field->value[0]);
-                                       dbg("Maximum Effects - %d",input->ff_effects_max);
-                                       break;
-                               case 0x98:  /* Device Control */
-                                       usage->code = FF_AUTOCENTER;    break;
-                               case 0xa4:  /* Safety Switch */
-                                       usage->code = BTN_DEAD;
-                                       bit = input->keybit;
-                                       usage->type = EV_KEY;
-                                       max = KEY_MAX;
-                                       dbg("Safety Switch Report\n");
-                                       break;
-                               case 0x9f: /* Device Paused */
-                               case 0xa0: /* Actuators Enabled */
-                                       dbg("Not telling the input API about ");
-                                       resolv_usage(usage->hid);
-                                       return;
+                               case 0x26: map_ff_effect(FF_CONSTANT);  goto ignore;
+                               case 0x27: map_ff_effect(FF_RAMP);      goto ignore;
+                               case 0x28: map_ff_effect(FF_CUSTOM);    goto ignore;
+                               case 0x30: map_ff_effect(FF_SQUARE);    map_ff_effect(FF_PERIODIC); goto ignore;
+                               case 0x31: map_ff_effect(FF_SINE);      map_ff_effect(FF_PERIODIC); goto ignore;
+                               case 0x32: map_ff_effect(FF_TRIANGLE);  map_ff_effect(FF_PERIODIC); goto ignore;
+                               case 0x33: map_ff_effect(FF_SAW_UP);    map_ff_effect(FF_PERIODIC); goto ignore;
+                               case 0x34: map_ff_effect(FF_SAW_DOWN);  map_ff_effect(FF_PERIODIC); goto ignore;
+                               case 0x40: map_ff_effect(FF_SPRING);    goto ignore;
+                               case 0x41: map_ff_effect(FF_DAMPER);    goto ignore;
+                               case 0x42: map_ff_effect(FF_INERTIA);   goto ignore;
+                               case 0x43: map_ff_effect(FF_FRICTION);  goto ignore;
+                               case 0x7e: map_ff(FF_GAIN);             break;
+                               case 0x83: input->ff_effects_max = field->value[0]; goto ignore;
+                               case 0x98: map_ff(FF_AUTOCENTER);       break;
+                               case 0xa4: map_key_clear(BTN_DEAD);     break;
+                               default: goto ignore;
                        }
                        break;
+
                default:
                unknown:
-                       resolv_usage(usage->hid);
-
                        if (field->report_size == 1) {
-
                                if (field->report->type == HID_OUTPUT_REPORT) {
-                                       usage->code = LED_MISC;
-                                       usage->type = EV_LED; bit = input->ledbit; max = LED_MAX;
+                                       map_led(LED_MISC);
                                        break;
                                }
-
-                               usage->code = BTN_MISC;
-                               usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX;
+                               map_key(BTN_MISC);
                                break;
                        }
-
                        if (field->flags & HID_MAIN_ITEM_RELATIVE) {
-                               usage->code = REL_MISC;
-                               usage->type = EV_REL; bit = input->relbit; max = REL_MAX;
+                               map_rel(REL_MISC);
                                break;
                        }
-
-                       usage->code = ABS_MISC;
-                       usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX;
+                       map_abs(ABS_MISC);
                        break;
        }
 
-       set_bit(usage->type, input->evbit);
-       if ((usage->type == EV_REL)
-                       && (device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_BACK
-                               | HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA))
-                       && (usage->code == REL_WHEEL)) {
-               set_bit(REL_HWHEEL, bit);
+       if (device->quirks & HID_QUIRK_MIGHTYMOUSE) {
+               if (usage->hid == HID_GD_Z)
+                       map_rel(REL_HWHEEL);
+               else if (usage->code == BTN_1)
+                       map_key(BTN_2);
+               else if (usage->code == BTN_2)
+                       map_key(BTN_1);
        }
 
-       while (usage->code <= max && test_and_set_bit(usage->code, bit)) {
+       if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5)) &&
+                (usage->type == EV_REL) && (usage->code == REL_WHEEL))
+                       set_bit(REL_HWHEEL, bit);
+
+       if (((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
+               || ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007)))
+               goto ignore;
+
+       set_bit(usage->type, input->evbit);
+
+       while (usage->code <= max && test_and_set_bit(usage->code, bit))
                usage->code = find_next_zero_bit(bit, max + 1, usage->code);
-       }
 
        if (usage->code > max)
-               return;
+               goto ignore;
+
 
        if (usage->type == EV_ABS) {
+
                int a = field->logical_minimum;
                int b = field->logical_maximum;
 
@@ -398,63 +617,82 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        a = field->logical_minimum = 0;
                        b = field->logical_maximum = 255;
                }
-               
-               input->absmin[usage->code] = a;
-               input->absmax[usage->code] = b;
-               input->absfuzz[usage->code] = 0;
-               input->absflat[usage->code] = 0;
-
-               if (field->application == HID_GD_GAMEPAD || field->application == HID_GD_JOYSTICK) {
-                       input->absfuzz[usage->code] = (b - a) >> 8;
-                       input->absflat[usage->code] = (b - a) >> 4;
-               }
+
+               if (field->application == HID_GD_GAMEPAD || field->application == HID_GD_JOYSTICK)
+                       input_set_abs_params(input, usage->code, a, b, (b - a) >> 8, (b - a) >> 4);
+               else    input_set_abs_params(input, usage->code, a, b, 0, 0);
+
        }
 
-       if (usage->hat_min != usage->hat_max) {
+       if (usage->type == EV_ABS &&
+           (usage->hat_min < usage->hat_max || usage->hat_dir)) {
                int i;
                for (i = usage->code; i < usage->code + 2 && i <= max; i++) {
-                       input->absmax[i] = 1;
-                       input->absmin[i] = -1;
-                       input->absfuzz[i] = 0;
-                       input->absflat[i] = 0;
+                       input_set_abs_params(input, i, -1, 1, 0, 0);
+                       set_bit(i, input->absbit);
                }
-               set_bit(usage->code + 1, input->absbit);
+               if (usage->hat_dir && !field->dpad)
+                       field->dpad = usage->code;
        }
+
+#ifdef DEBUG
+       resolv_event(usage->type, usage->code);
+       printk("\n");
+#endif
+       return;
+
+ignore:
+#ifdef DEBUG
+       printk("IGNORED\n");
+#endif
+       return;
 }
 
 void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, struct pt_regs *regs)
 {
-       struct input_dev *input = find_input(hid, field);
+       struct input_dev *input;
        int *quirks = &hid->quirks;
 
-       if (!input)
+       if (!field->hidinput)
                return;
 
+       input = field->hidinput->input;
+
        input_regs(input, regs);
 
-       if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_EXTRA) && (usage->code == BTN_EXTRA))
-               || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_BACK) && (usage->code == BTN_BACK))) {
-               if (value)
-                       hid->quirks |= HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
-               else
-                       hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
+       if (!usage->type)
+               return;
+
+       if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
+               || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007))) {
+               if (value) hid->quirks |=  HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
+               else       hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
                return;
        }
 
-       if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON)
-                       && (usage->code == REL_WHEEL)) {
-               input_event(input, usage->type, REL_HWHEEL, value);
+       if ((hid->quirks & HID_QUIRK_INVERT_HWHEEL) && (usage->code == REL_HWHEEL)) {
+               input_event(input, usage->type, usage->code, -value);
                return;
        }
 
-       if (usage->hat_min != usage->hat_max ) { /* FIXME: hat_max can be 0 and hat_min 1 */
-               value = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1;
-               if (value < 0 || value > 8) value = 0;
-               input_event(input, usage->type, usage->code    , hid_hat_to_axis[value].x);
-               input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[value].y);
+       if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON) && (usage->code == REL_WHEEL)) {
+               input_event(input, usage->type, REL_HWHEEL, value);
                return;
        }
 
+       if ((hid->quirks & HID_QUIRK_POWERBOOK_HAS_FN) && hidinput_pb_event(hid, input, usage, value))
+               return;
+
+       if (usage->hat_min < usage->hat_max || usage->hat_dir) {
+               int hat_dir = usage->hat_dir;
+               if (!hat_dir)
+                       hat_dir = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1;
+               if (hat_dir < 0 || hat_dir > 8) hat_dir = 0;
+               input_event(input, usage->type, usage->code    , hid_hat_to_axis[hat_dir].x);
+                input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y);
+                return;
+        }
+
        if (usage->hid == (HID_UP_DIGITIZER | 0x003c)) { /* Invert */
                *quirks = value ? (*quirks | HID_QUIRK_INVERT) : (*quirks & ~HID_QUIRK_INVERT);
                return;
@@ -481,12 +719,13 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
                dbg("Maximum Effects - %d",input->ff_effects_max);
                return;
        }
+
        if (usage->hid == (HID_UP_PID | 0x7fUL)) {
                dbg("PID Pool Report\n");
                return;
        }
 
-       if((usage->type == EV_KEY) && (usage->code == 0)) /* Key 0 is "unassigned", not KEY_UNKNOWN */
+       if ((usage->type == EV_KEY) && (usage->code == 0)) /* Key 0 is "unassigned", not KEY_UNKNOWN */
                return;
 
        input_event(input, usage->type, usage->code, value);
@@ -497,25 +736,41 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 
 void hidinput_report_event(struct hid_device *hid, struct hid_report *report)
 {
-       struct list_head *lh;
        struct hid_input *hidinput;
 
-       list_for_each (lh, &hid->inputs) {
-               hidinput = list_entry(lh, struct hid_input, list);
-               input_sync(&hidinput->input);
+       list_for_each_entry(hidinput, &hid->inputs, list)
+               input_sync(hidinput->input);
+}
+
+static int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field)
+{
+       struct hid_report *report;
+       int i, j;
+
+       list_for_each_entry(report, &hid->report_enum[HID_OUTPUT_REPORT].report_list, list) {
+               for (i = 0; i < report->maxfield; i++) {
+                       *field = report->field[i];
+                       for (j = 0; j < (*field)->maxusage; j++)
+                               if ((*field)->usage[j].type == type && (*field)->usage[j].code == code)
+                                       return j;
+               }
        }
+       return -1;
 }
 
 static int hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
        struct hid_device *hid = dev->private;
-       struct hid_field *field = NULL;
+       struct hid_field *field;
        int offset;
 
        if (type == EV_FF)
                return hid_ff_event(hid, dev, type, code, value);
 
-       if ((offset = hid_find_field(hid, type, code, &field)) == -1) {
+       if (type != EV_LED)
+               return -1;
+
+       if ((offset = hidinput_find_field(hid, type, code, &field)) == -1) {
                warn("event field not found");
                return -1;
        }
@@ -547,56 +802,51 @@ static void hidinput_close(struct input_dev *dev)
 int hidinput_connect(struct hid_device *hid)
 {
        struct usb_device *dev = hid->dev;
-       struct hid_report_enum *report_enum;
        struct hid_report *report;
-       struct list_head *list;
        struct hid_input *hidinput = NULL;
+       struct input_dev *input_dev;
        int i, j, k;
 
        INIT_LIST_HEAD(&hid->inputs);
 
        for (i = 0; i < hid->maxcollection; i++)
-               if (hid->collection[i].type == HID_COLLECTION_APPLICATION &&
-                   IS_INPUT_APPLICATION(hid->collection[i].usage))
-                       break;
+               if (hid->collection[i].type == HID_COLLECTION_APPLICATION ||
+                   hid->collection[i].type == HID_COLLECTION_PHYSICAL)
+                       if (IS_INPUT_APPLICATION(hid->collection[i].usage))
+                               break;
 
        if (i == hid->maxcollection)
                return -1;
 
-       for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++) {
-               report_enum = hid->report_enum + k;
-               list = report_enum->report_list.next;
-               while (list != &report_enum->report_list) {
-                       report = (struct hid_report *) list;
+       for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++)
+               list_for_each_entry(report, &hid->report_enum[k].report_list, list) {
 
-                       if (!report->maxfield) {
-                               list = list->next;
+                       if (!report->maxfield)
                                continue;
-                       }
 
                        if (!hidinput) {
-                               hidinput = kmalloc(sizeof(*hidinput), GFP_KERNEL);
-                               if (!hidinput) {
+                               hidinput = kzalloc(sizeof(*hidinput), GFP_KERNEL);
+                               input_dev = input_allocate_device();
+                               if (!hidinput || !input_dev) {
+                                       kfree(hidinput);
+                                       input_free_device(input_dev);
                                        err("Out of memory during hid input probe");
                                        return -1;
                                }
-                               memset(hidinput, 0, sizeof(*hidinput));
 
-                               list_add_tail(&hidinput->list, &hid->inputs);
+                               input_dev->private = hid;
+                               input_dev->event = hidinput_input_event;
+                               input_dev->open = hidinput_open;
+                               input_dev->close = hidinput_close;
+
+                               input_dev->name = hid->name;
+                               input_dev->phys = hid->phys;
+                               input_dev->uniq = hid->uniq;
+                               usb_to_input_id(dev, &input_dev->id);
+                               input_dev->cdev.dev = &hid->intf->dev;
 
-                               hidinput->input.private = hid;
-                               hidinput->input.event = hidinput_input_event;
-                               hidinput->input.open = hidinput_open;
-                               hidinput->input.close = hidinput_close;
-
-                               hidinput->input.name = hid->name;
-                               hidinput->input.phys = hid->phys;
-                               hidinput->input.uniq = hid->uniq;
-                               hidinput->input.id.bustype = BUS_USB;
-                               hidinput->input.id.vendor = dev->descriptor.idVendor;
-                               hidinput->input.id.product = dev->descriptor.idProduct;
-                               hidinput->input.id.version = dev->descriptor.bcdDevice;
-                               hidinput->input.dev = &hid->intf->dev;
+                               hidinput->input = input_dev;
+                               list_add_tail(&hidinput->list, &hid->inputs);
                        }
 
                        for (i = 0; i < report->maxfield; i++)
@@ -611,20 +861,17 @@ int hidinput_connect(struct hid_device *hid)
                                 * UGCI) cram a lot of unrelated inputs into the
                                 * same interface. */
                                hidinput->report = report;
-                               input_register_device(&hidinput->input);
+                               input_register_device(hidinput->input);
                                hidinput = NULL;
                        }
-
-                       list = list->next;
                }
-       }
 
        /* This only gets called when we are a single-input (most of the
         * time). IOW, not a HID_QUIRK_MULTI_INPUT. The hid_ff_init() is
         * only useful in this case, and not for multi-input quirks. */
        if (hidinput) {
                hid_ff_init(hid);
-               input_register_device(&hidinput->input);
+               input_register_device(hidinput->input);
        }
 
        return 0;
@@ -632,13 +879,11 @@ int hidinput_connect(struct hid_device *hid)
 
 void hidinput_disconnect(struct hid_device *hid)
 {
-       struct list_head *lh, *next;
-       struct hid_input *hidinput;
+       struct hid_input *hidinput, *next;
 
-       list_for_each_safe (lh, next, &hid->inputs) {
-               hidinput = list_entry(lh, struct hid_input, list);
-               input_unregister_device(&hidinput->input);
+       list_for_each_entry_safe(hidinput, next, &hid->inputs, list) {
                list_del(&hidinput->list);
+               input_unregister_device(hidinput->input);
                kfree(hidinput);
        }
 }