Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

22 files changed, 643 insertions, 63 deletions

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 1e53934907c0..509dd0a04c54 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -273,6 +273,20 @@ config USB_ATI_REMOTE
           To compile this driver as a module, choose M here: the module will be
           called ati_remote.
 
+config USB_ATI_REMOTE2
+        tristate "ATI / Philips USB RF remote control"
+        depends on USB && INPUT
+        ---help---
+          Say Y here if you want to use an ATI or Philips USB RF remote control.
+          These are RF remotes with USB receivers.
+          ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards
+          and is also available as a separate product.
+          This driver provides mouse pointer, left and right mouse buttons,
+          and maps all the other remote buttons to keypress events.
+
+          To compile this driver as a module, choose M here: the module will be
+          called ati_remote2.
+
 config USB_KEYSPAN_REMOTE
         tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
         depends on USB && INPUT && EXPERIMENTAL
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 07cb17db42fc..d512d9f488fe 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -28,6 +28,7 @@ endif
 
 obj-$(CONFIG_USB_AIPTEK)        += aiptek.o
 obj-$(CONFIG_USB_ATI_REMOTE)    += ati_remote.o
+obj-$(CONFIG_USB_ATI_REMOTE2)   += ati_remote2.o
 obj-$(CONFIG_USB_HID)           += usbhid.o
 obj-$(CONFIG_USB_KBD)           += usbkbd.o
 obj-$(CONFIG_USB_KBTAB)         += kbtab.o
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index a32558b4048e..df29b8078b54 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -261,7 +261,6 @@ static struct usb_device_id usb_acecad_id_table [] = {
 MODULE_DEVICE_TABLE(usb, usb_acecad_id_table);
 
 static struct usb_driver usb_acecad_driver = {
-        .owner =        THIS_MODULE,
         .name =         "usb_acecad",
         .probe =        usb_acecad_probe,
         .disconnect =   usb_acecad_disconnect,
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 1c3b472a3bca..a6693b0d1c4c 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -338,7 +338,7 @@ struct aiptek {
  * the bitmap which comes from the tablet. This hides the
  * issue that the F_keys are not sequentially numbered.
  */
-static int macroKeyEvents[] = {
+static const int macroKeyEvents[] = {
         KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5,
         KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11,
         KEY_F12, KEY_F13, KEY_F14, KEY_F15, KEY_F16, KEY_F17,
@@ -2093,7 +2093,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         /* Programming the tablet macro keys needs to be done with a for loop
          * as the keycodes are discontiguous.
          */
-        for (i = 0; i < sizeof(macroKeyEvents) / sizeof(macroKeyEvents[0]); ++i)
+        for (i = 0; i < ARRAY_SIZE(macroKeyEvents); ++i)
                 set_bit(macroKeyEvents[i], inputdev->keybit);
 
         /*
@@ -2103,7 +2103,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
          * values.
          */
         input_set_abs_params(inputdev, ABS_X, 0, 2999, 0, 0);
-        input_set_abs_params(inputdev, ABS_X, 0, 2249, 0, 0);
+        input_set_abs_params(inputdev, ABS_Y, 0, 2249, 0, 0);
         input_set_abs_params(inputdev, ABS_PRESSURE, 0, 511, 0, 0);
         input_set_abs_params(inputdev, ABS_TILT_X, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
         input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
@@ -2135,7 +2135,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
          * not an error :-)
          */
 
-        for (i = 0; i < sizeof(speeds) / sizeof(speeds[0]); ++i) {
+        for (i = 0; i < ARRAY_SIZE(speeds); ++i) {
                 aiptek->curSetting.programmableDelay = speeds[i];
                 (void)aiptek_program_tablet(aiptek);
                 if (aiptek->inputdev->absmax[ABS_X] > 0) {
@@ -2190,7 +2190,6 @@ fail1:	input_free_device(inputdev);
 static void aiptek_disconnect(struct usb_interface *intf);
 
 static struct usb_driver aiptek_driver = {
-        .owner = THIS_MODULE,
         .name = "aiptek",
         .probe = aiptek_probe,
         .disconnect = aiptek_disconnect,
diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c
index 6cce8527ba06..c222ed13deab 100644
--- a/drivers/usb/input/appletouch.c
+++ b/drivers/usb/input/appletouch.c
@@ -525,7 +525,6 @@ static int atp_resume(struct usb_interface *iface)
 }
 
 static struct usb_driver atp_driver = {
-        .owner          = THIS_MODULE,
         .name           = "appletouch",
         .probe          = atp_probe,
         .disconnect     = atp_disconnect,
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 9a2a47db9494..f7bdc506e613 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -96,6 +96,7 @@
 #include <linux/usb.h>
 #include <linux/usb_input.h>
 #include <linux/wait.h>
+#include <linux/jiffies.h>
 
 /*
  * Module and Version Information, Module Parameters
@@ -146,7 +147,7 @@ static char init1[] = { 0x01, 0x00, 0x20, 0x14 };
 static char init2[] = { 0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20 };
 
 /* Acceleration curve for directional control pad */
-static char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
+static const char accel[] = { 1, 2, 4, 6, 9, 13, 20 };
 
 /* Duplicate event filtering time.
  * Sequential, identical KIND_FILTERED inputs with less than
@@ -197,7 +198,7 @@ struct ati_remote {
 #define KIND_ACCEL      7   /* Directional keypad - left, right, up, down.*/
 
 /* Translation table from hardware messages to input events. */
-static struct {
+static const struct {
         short kind;
         unsigned char data1, data2;
         int type;
@@ -295,7 +296,6 @@ static void ati_remote_disconnect	(struct usb_interface *interface);
 
 /* usb specific object to register with the usb subsystem */
 static struct usb_driver ati_remote_driver = {
-        .owner        = THIS_MODULE,
         .name         = "ati_remote",
         .probe        = ati_remote_probe,
         .disconnect   = ati_remote_disconnect,
@@ -472,7 +472,7 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
                 /* Filter duplicate events which happen "too close" together. */
                 if ((ati_remote->old_data[0] == data[1]) &&
                         (ati_remote->old_data[1] == data[2]) &&
-                        ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) {
+                        time_before(jiffies, ati_remote->old_jiffies + FILTER_TIME)) {
                         ati_remote->repeat_count++;
                 } else {
                         ati_remote->repeat_count = 0;
@@ -507,16 +507,16 @@ static void ati_remote_input_report(struct urb *urb, struct pt_regs *regs)
          * pad down, so we increase acceleration, ramping up over two seconds to
          * a maximum speed.  The acceleration curve is #defined above.
          */
-        if ((jiffies - ati_remote->old_jiffies) > (HZ >> 2)) {
+        if (time_after(jiffies, ati_remote->old_jiffies + (HZ >> 2))) {
                 acc = 1;
                 ati_remote->acc_jiffies = jiffies;
         }
-        else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 3))  acc = accel[0];
-        else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 2))  acc = accel[1];
-        else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 1))  acc = accel[2];
-        else if ((jiffies - ati_remote->acc_jiffies) < HZ )        acc = accel[3];
-        else if ((jiffies - ati_remote->acc_jiffies) < HZ+(HZ>>1)) acc = accel[4];
-        else if ((jiffies - ati_remote->acc_jiffies) < (HZ << 1))  acc = accel[5];
+        else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ >> 3)))  acc = accel[0];
+        else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ >> 2)))  acc = accel[1];
+        else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ >> 1)))  acc = accel[2];
+        else if (time_before(jiffies, ati_remote->acc_jiffies + HZ))         acc = accel[3];
+        else if (time_before(jiffies, ati_remote->acc_jiffies + HZ+(HZ>>1))) acc = accel[4];
+        else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ << 1)))  acc = accel[5];
         else acc = accel[6];
 
         input_regs(dev, regs);
diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c
new file mode 100644
index 000000000000..ab1a1ae24be9
--- /dev/null
+++ b/drivers/usb/input/ati_remote2.c
@@ -0,0 +1,477 @@
+/*
+ * ati_remote2 - ATI/Philips USB RF remote driver
+ *
+ * Copyright (C) 2005 Ville Syrjala <syrjala@sci.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ */
+
+#include <linux/usb_input.h>
+
+#define DRIVER_DESC    "ATI/Philips USB RF remote driver"
+#define DRIVER_VERSION "0.1"
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_AUTHOR("Ville Syrjala <syrjala@sci.fi>");
+MODULE_LICENSE("GPL");
+
+static unsigned int mode_mask = 0x1F;
+module_param(mode_mask, uint, 0644);
+MODULE_PARM_DESC(mode_mask, "Bitmask of modes to accept <4:PC><3:AUX4><2:AUX3><1:AUX2><0:AUX1>");
+
+static struct usb_device_id ati_remote2_id_table[] = {
+        { USB_DEVICE(0x0471, 0x0602) }, /* ATI Remote Wonder II */
+        { }
+};
+MODULE_DEVICE_TABLE(usb, ati_remote2_id_table);
+
+static struct {
+        int hw_code;
+        int key_code;
+} ati_remote2_key_table[] = {
+        { 0x00, KEY_0 },
+        { 0x01, KEY_1 },
+        { 0x02, KEY_2 },
+        { 0x03, KEY_3 },
+        { 0x04, KEY_4 },
+        { 0x05, KEY_5 },
+        { 0x06, KEY_6 },
+        { 0x07, KEY_7 },
+        { 0x08, KEY_8 },
+        { 0x09, KEY_9 },
+        { 0x0c, KEY_POWER },
+        { 0x0d, KEY_MUTE },
+        { 0x10, KEY_VOLUMEUP },
+        { 0x11, KEY_VOLUMEDOWN },
+        { 0x20, KEY_CHANNELUP },
+        { 0x21, KEY_CHANNELDOWN },
+        { 0x28, KEY_FORWARD },
+        { 0x29, KEY_REWIND },
+        { 0x2c, KEY_PLAY },
+        { 0x30, KEY_PAUSE },
+        { 0x31, KEY_STOP },
+        { 0x37, KEY_RECORD },
+        { 0x38, KEY_DVD },
+        { 0x39, KEY_TV },
+        { 0x54, KEY_MENU },
+        { 0x58, KEY_UP },
+        { 0x59, KEY_DOWN },
+        { 0x5a, KEY_LEFT },
+        { 0x5b, KEY_RIGHT },
+        { 0x5c, KEY_OK },
+        { 0x78, KEY_A },
+        { 0x79, KEY_B },
+        { 0x7a, KEY_C },
+        { 0x7b, KEY_D },
+        { 0x7c, KEY_E },
+        { 0x7d, KEY_F },
+        { 0x82, KEY_ENTER },
+        { 0x8e, KEY_VENDOR },
+        { 0x96, KEY_COFFEE },
+        { 0xa9, BTN_LEFT },
+        { 0xaa, BTN_RIGHT },
+        { 0xbe, KEY_QUESTION },
+        { 0xd5, KEY_FRONT },
+        { 0xd0, KEY_EDIT },
+        { 0xf9, KEY_INFO },
+        { (0x00 << 8) | 0x3f, KEY_PROG1 },
+        { (0x01 << 8) | 0x3f, KEY_PROG2 },
+        { (0x02 << 8) | 0x3f, KEY_PROG3 },
+        { (0x03 << 8) | 0x3f, KEY_PROG4 },
+        { (0x04 << 8) | 0x3f, KEY_PC },
+        { 0, KEY_RESERVED }
+};
+
+struct ati_remote2 {
+        struct input_dev *idev;
+        struct usb_device *udev;
+
+        struct usb_interface *intf[2];
+        struct usb_endpoint_descriptor *ep[2];
+        struct urb *urb[2];
+        void *buf[2];
+        dma_addr_t buf_dma[2];
+
+        unsigned long jiffies;
+        int mode;
+
+        char name[64];
+        char phys[64];
+};
+
+static int ati_remote2_probe(struct usb_interface *interface, const struct usb_device_id *id);
+static void ati_remote2_disconnect(struct usb_interface *interface);
+
+static struct usb_driver ati_remote2_driver = {
+        .name       = "ati_remote2",
+        .probe      = ati_remote2_probe,
+        .disconnect = ati_remote2_disconnect,
+        .id_table   = ati_remote2_id_table,
+};
+
+static int ati_remote2_open(struct input_dev *idev)
+{
+        struct ati_remote2 *ar2 = idev->private;
+        int r;
+
+        r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);
+        if (r) {
+                dev_err(&ar2->intf[0]->dev,
+                        "%s: usb_submit_urb() = %d\n", __FUNCTION__, r);
+                return r;
+        }
+        r = usb_submit_urb(ar2->urb[1], GFP_KERNEL);
+        if (r) {
+                usb_kill_urb(ar2->urb[0]);
+                dev_err(&ar2->intf[1]->dev,
+                        "%s: usb_submit_urb() = %d\n", __FUNCTION__, r);
+                return r;
+        }
+
+        return 0;
+}
+
+static void ati_remote2_close(struct input_dev *idev)
+{
+        struct ati_remote2 *ar2 = idev->private;
+
+        usb_kill_urb(ar2->urb[0]);
+        usb_kill_urb(ar2->urb[1]);
+}
+
+static void ati_remote2_input_mouse(struct ati_remote2 *ar2, struct pt_regs *regs)
+{
+        struct input_dev *idev = ar2->idev;
+        u8 *data = ar2->buf[0];
+
+        if (data[0] > 4) {
+                dev_err(&ar2->intf[0]->dev,
+                        "Unknown mode byte (%02x %02x %02x %02x)\n",
+                        data[3], data[2], data[1], data[0]);
+                return;
+        }
+
+        if (!((1 << data[0]) & mode_mask))
+                return;
+
+        input_regs(idev, regs);
+        input_event(idev, EV_REL, REL_X, (s8) data[1]);
+        input_event(idev, EV_REL, REL_Y, (s8) data[2]);
+        input_sync(idev);
+}
+
+static int ati_remote2_lookup(unsigned int hw_code)
+{
+        int i;
+
+        for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)
+                if (ati_remote2_key_table[i].hw_code == hw_code)
+                        return i;
+
+        return -1;
+}
+
+static void ati_remote2_input_key(struct ati_remote2 *ar2, struct pt_regs *regs)
+{
+        struct input_dev *idev = ar2->idev;
+        u8 *data = ar2->buf[1];
+        int hw_code, index;
+
+        if (data[0] > 4) {
+                dev_err(&ar2->intf[1]->dev,
+                        "Unknown mode byte (%02x %02x %02x %02x)\n",
+                        data[3], data[2], data[1], data[0]);
+                return;
+        }
+
+        hw_code = data[2];
+        /*
+         * Mode keys (AUX1-AUX4, PC) all generate the same code byte.
+         * Use the mode byte to figure out which one was pressed.
+         */
+        if (hw_code == 0x3f) {
+                /*
+                 * For some incomprehensible reason the mouse pad generates
+                 * events which look identical to the events from the last
+                 * pressed mode key. Naturally we don't want to generate key
+                 * events for the mouse pad so we filter out any subsequent
+                 * events from the same mode key.
+                 */
+                if (ar2->mode == data[0])
+                        return;
+
+                if (data[1] == 0)
+                        ar2->mode = data[0];
+
+                hw_code |= data[0] << 8;
+        }
+
+        if (!((1 << data[0]) & mode_mask))
+                return;
+
+        index = ati_remote2_lookup(hw_code);
+        if (index < 0) {
+                dev_err(&ar2->intf[1]->dev,
+                        "Unknown code byte (%02x %02x %02x %02x)\n",
+                        data[3], data[2], data[1], data[0]);
+                return;
+        }
+
+        switch (data[1]) {
+        case 0: /* release */
+                break;
+        case 1: /* press */
+                ar2->jiffies = jiffies + msecs_to_jiffies(idev->rep[REP_DELAY]);
+                break;
+        case 2: /* repeat */
+
+                /* No repeat for mouse buttons. */
+                if (ati_remote2_key_table[index].key_code == BTN_LEFT ||
+                    ati_remote2_key_table[index].key_code == BTN_RIGHT)
+                        return;
+
+                if (!time_after_eq(jiffies, ar2->jiffies))
+                        return;
+
+                ar2->jiffies = jiffies + msecs_to_jiffies(idev->rep[REP_PERIOD]);
+                break;
+        default:
+                dev_err(&ar2->intf[1]->dev,
+                        "Unknown state byte (%02x %02x %02x %02x)\n",
+                        data[3], data[2], data[1], data[0]);
+                return;
+        }
+
+        input_regs(idev, regs);
+        input_event(idev, EV_KEY, ati_remote2_key_table[index].key_code, data[1]);
+        input_sync(idev);
+}
+
+static void ati_remote2_complete_mouse(struct urb *urb, struct pt_regs *regs)
+{
+        struct ati_remote2 *ar2 = urb->context;
+        int r;
+
+        switch (urb->status) {
+        case 0:
+                ati_remote2_input_mouse(ar2, regs);
+                break;
+        case -ENOENT:
+        case -EILSEQ:
+        case -ECONNRESET:
+        case -ESHUTDOWN:
+                dev_dbg(&ar2->intf[0]->dev,
+                        "%s(): urb status = %d\n", __FUNCTION__, urb->status);
+                return;
+        default:
+                dev_err(&ar2->intf[0]->dev,
+                        "%s(): urb status = %d\n", __FUNCTION__, urb->status);
+        }
+
+        r = usb_submit_urb(urb, GFP_ATOMIC);
+        if (r)
+                dev_err(&ar2->intf[0]->dev,
+                        "%s(): usb_submit_urb() = %d\n", __FUNCTION__, r);
+}
+
+static void ati_remote2_complete_key(struct urb *urb, struct pt_regs *regs)
+{
+        struct ati_remote2 *ar2 = urb->context;
+        int r;
+
+        switch (urb->status) {
+        case 0:
+                ati_remote2_input_key(ar2, regs);
+                break;
+        case -ENOENT:
+        case -EILSEQ:
+        case -ECONNRESET:
+        case -ESHUTDOWN:
+                dev_dbg(&ar2->intf[1]->dev,
+                        "%s(): urb status = %d\n", __FUNCTION__, urb->status);
+                return;
+        default:
+                dev_err(&ar2->intf[1]->dev,
+                        "%s(): urb status = %d\n", __FUNCTION__, urb->status);
+        }
+
+        r = usb_submit_urb(urb, GFP_ATOMIC);
+        if (r)
+                dev_err(&ar2->intf[1]->dev,
+                        "%s(): usb_submit_urb() = %d\n", __FUNCTION__, r);
+}
+
+static int ati_remote2_input_init(struct ati_remote2 *ar2)
+{
+        struct input_dev *idev;
+        int i;
+
+        idev = input_allocate_device();
+        if (!idev)
+                return -ENOMEM;
+
+        ar2->idev = idev;
+        idev->private = ar2;
+
+        idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_REL);
+        idev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);
+        idev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+        for (i = 0; ati_remote2_key_table[i].key_code != KEY_RESERVED; i++)
+                set_bit(ati_remote2_key_table[i].key_code, idev->keybit);
+
+        idev->rep[REP_DELAY]  = 250;
+        idev->rep[REP_PERIOD] = 33;
+
+        idev->open = ati_remote2_open;
+        idev->close = ati_remote2_close;
+
+        idev->name = ar2->name;
+        idev->phys = ar2->phys;
+
+        usb_to_input_id(ar2->udev, &idev->id);
+        idev->cdev.dev = &ar2->udev->dev;
+
+        i = input_register_device(idev);
+        if (i)
+                input_free_device(idev);
+
+        return i;
+}
+
+static int ati_remote2_urb_init(struct ati_remote2 *ar2)
+{
+        struct usb_device *udev = ar2->udev;
+        int i, pipe, maxp;
+
+        for (i = 0; i < 2; i++) {
+                ar2->buf[i] = usb_buffer_alloc(udev, 4, GFP_KERNEL, &ar2->buf_dma[i]);
+                if (!ar2->buf[i])
+                        return -ENOMEM;
+
+                ar2->urb[i] = usb_alloc_urb(0, GFP_KERNEL);
+                if (!ar2->urb[i])
+                        return -ENOMEM;
+
+                pipe = usb_rcvintpipe(udev, ar2->ep[i]->bEndpointAddress);
+                maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
+                maxp = maxp > 4 ? 4 : maxp;
+
+                usb_fill_int_urb(ar2->urb[i], udev, pipe, ar2->buf[i], maxp,
+                                 i ? ati_remote2_complete_key : ati_remote2_complete_mouse,
+                                 ar2, ar2->ep[i]->bInterval);
+                ar2->urb[i]->transfer_dma = ar2->buf_dma[i];
+                ar2->urb[i]->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        }
+
+        return 0;
+}
+
+static void ati_remote2_urb_cleanup(struct ati_remote2 *ar2)
+{
+        int i;
+
+        for (i = 0; i < 2; i++) {
+                if (ar2->urb[i])
+                        usb_free_urb(ar2->urb[i]);
+
+                if (ar2->buf[i])
+                        usb_buffer_free(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]);
+        }
+}
+
+static int ati_remote2_probe(struct usb_interface *interface, const struct usb_device_id *id)
+{
+        struct usb_device *udev = interface_to_usbdev(interface);
+        struct usb_host_interface *alt = interface->cur_altsetting;
+        struct ati_remote2 *ar2;
+        int r;
+
+        if (alt->desc.bInterfaceNumber)
+                return -ENODEV;
+
+        ar2 = kzalloc(sizeof (struct ati_remote2), GFP_KERNEL);
+        if (!ar2)
+                return -ENOMEM;
+
+        ar2->udev = udev;
+
+        ar2->intf[0] = interface;
+        ar2->ep[0] = &alt->endpoint[0].desc;
+
+        ar2->intf[1] = usb_ifnum_to_if(udev, 1);
+        r = usb_driver_claim_interface(&ati_remote2_driver, ar2->intf[1], ar2);
+        if (r)
+                goto fail1;
+        alt = ar2->intf[1]->cur_altsetting;
+        ar2->ep[1] = &alt->endpoint[0].desc;
+
+        r = ati_remote2_urb_init(ar2);
+        if (r)
+                goto fail2;
+
+        usb_make_path(udev, ar2->phys, sizeof(ar2->phys));
+        strlcat(ar2->phys, "/input0", sizeof(ar2->phys));
+
+        strlcat(ar2->name, "ATI Remote Wonder II", sizeof(ar2->name));
+
+        r = ati_remote2_input_init(ar2);
+        if (r)
+                goto fail2;
+
+        usb_set_intfdata(interface, ar2);
+
+        return 0;
+
+ fail2:
+        ati_remote2_urb_cleanup(ar2);
+
+        usb_driver_release_interface(&ati_remote2_driver, ar2->intf[1]);
+ fail1:
+        kfree(ar2);
+
+        return r;
+}
+
+static void ati_remote2_disconnect(struct usb_interface *interface)
+{
+        struct ati_remote2 *ar2;
+        struct usb_host_interface *alt = interface->cur_altsetting;
+
+        if (alt->desc.bInterfaceNumber)
+                return;
+
+        ar2 = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
+
+        input_unregister_device(ar2->idev);
+
+        ati_remote2_urb_cleanup(ar2);
+
+        usb_driver_release_interface(&ati_remote2_driver, ar2->intf[1]);
+
+        kfree(ar2);
+}
+
+static int __init ati_remote2_init(void)
+{
+        int r;
+
+        r = usb_register(&ati_remote2_driver);
+        if (r)
+                printk(KERN_ERR "ati_remote2: usb_register() = %d\n", r);
+        else
+                printk(KERN_INFO "ati_remote2: " DRIVER_DESC " " DRIVER_VERSION "\n");
+
+        return r;
+}
+
+static void __exit ati_remote2_exit(void)
+{
+        usb_deregister(&ati_remote2_driver);
+}
+
+module_init(ati_remote2_init);
+module_exit(ati_remote2_exit);
diff --git a/drivers/usb/input/fixp-arith.h b/drivers/usb/input/fixp-arith.h
index 26ca5b890a61..b44d398de071 100644
--- a/drivers/usb/input/fixp-arith.h
+++ b/drivers/usb/input/fixp-arith.h
@@ -38,7 +38,7 @@ typedef s16 fixp_t;
 #define FRAC_MASK ((1<<FRAC_N)-1)
 
 // Not to be used directly. Use fixp_{cos,sin}
-static fixp_t cos_table[45] = {
+static const fixp_t cos_table[45] = {
         0x0100, 0x00FF, 0x00FF, 0x00FE, 0x00FD, 0x00FC, 0x00FA, 0x00F8,
         0x00F6, 0x00F3, 0x00F0, 0x00ED, 0x00E9, 0x00E6, 0x00E2, 0x00DD,
         0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1,
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index a3e44ef1df43..5f52979af1c7 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1454,7 +1454,7 @@ void hid_init_reports(struct hid_device *hid)
  * Alphabetically sorted blacklist by quirk type.
  */
 
-static struct hid_blacklist {
+static const struct hid_blacklist {
         __u16 idVendor;
         __u16 idProduct;
         unsigned quirks;
@@ -1930,7 +1930,6 @@ static struct usb_device_id hid_usb_ids [] = {
 MODULE_DEVICE_TABLE (usb, hid_usb_ids);
 
 static struct usb_driver hid_driver = {
-        .owner =        THIS_MODULE,
         .name =         "usbhid",
         .probe =        hid_probe,
         .disconnect =   hid_disconnect,
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 1220a5004a5c..192a03b28971 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -39,7 +39,7 @@
 
 #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,
@@ -58,7 +58,7 @@ 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}};
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 440377c7a0da..4dff8473553d 100644
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -826,7 +826,6 @@ static int hiddev_usbd_probe(struct usb_interface *intf,
 
 
 static /* const */ struct usb_driver hiddev_driver = {
-        .owner =        THIS_MODULE,
         .name =         "hiddev",
         .probe =        hiddev_usbd_probe,
 };
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 4a50acb39d29..7618ae5c104f 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -250,7 +250,6 @@ static void itmtouch_disconnect(struct usb_interface *intf)
 MODULE_DEVICE_TABLE(usb, itmtouch_ids);
 
 static struct usb_driver itmtouch_driver = {
-        .owner =        THIS_MODULE,
         .name =         "itmtouch",
         .probe =        itmtouch_probe,
         .disconnect =   itmtouch_disconnect,
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index a248664b5d1d..f6d5cead542b 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -159,7 +159,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH);
         input_dev->mscbit[0] |= BIT(MSC_SERIAL);
         input_set_abs_params(input_dev, ABS_X, 0, 0x2000, 4, 0);
-        input_set_abs_params(input_dev, ABS_X, 0, 0x1750, 4, 0);
+        input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
 
         endpoint = &intf->cur_altsetting->endpoint[0].desc;
@@ -197,7 +197,6 @@ static void kbtab_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver kbtab_driver = {
-        .owner =        THIS_MODULE,
         .name =         "kbtab",
         .probe =        kbtab_probe,
         .disconnect =   kbtab_disconnect,
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index a32cfe51b77d..b4a051b549d1 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -95,7 +95,7 @@ struct usb_keyspan {
  * Currently there are 15 and 17 button models so RESERVED codes
  * are blank areas in the mapping.
  */
-static int keyspan_key_table[] = {
+static const int keyspan_key_table[] = {
         KEY_RESERVED,           /* 0 is just a place holder. */
         KEY_RESERVED,
         KEY_STOP,
@@ -559,7 +559,6 @@ static void keyspan_disconnect(struct usb_interface *interface)
  */
 static struct usb_driver keyspan_driver =
 {
-        .owner =        THIS_MODULE,
         .name =         "keyspan_remote",
         .probe =        keyspan_probe,
         .disconnect =   keyspan_disconnect,
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c
index 52cc18cd247d..f018953a5485 100644
--- a/drivers/usb/input/mtouchusb.c
+++ b/drivers/usb/input/mtouchusb.c
@@ -310,7 +310,6 @@ static void mtouchusb_disconnect(struct usb_interface *intf)
 MODULE_DEVICE_TABLE(usb, mtouchusb_devices);
 
 static struct usb_driver mtouchusb_driver = {
-        .owner          = THIS_MODULE,
         .name           = "mtouchusb",
         .probe          = mtouchusb_probe,
         .disconnect     = mtouchusb_disconnect,
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index b7476233ef5d..fdf0f788062c 100644
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -441,7 +441,6 @@ static struct usb_device_id powermate_devices [] = {
 MODULE_DEVICE_TABLE (usb, powermate_devices);
 
 static struct usb_driver powermate_driver = {
-        .owner =        THIS_MODULE,
         .name =         "powermate",
         .probe =        powermate_probe,
         .disconnect =   powermate_disconnect,
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
index 7420c6b84284..3b3c7b4120a2 100644
--- a/drivers/usb/input/touchkitusb.c
+++ b/drivers/usb/input/touchkitusb.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  * touchkitusb.c  --  Driver for eGalax TouchKit USB Touchscreens
  *
- * Copyright (C) 2004 by Daniel Ritz
+ * Copyright (C) 2004-2005 by Daniel Ritz <daniel.ritz@gmx.ch>
  * Copyright (C) by Todd E. Johnson (mtouchusb.c)
  *
  * This program is free software; you can redistribute it and/or
@@ -41,15 +41,13 @@
 #define TOUCHKIT_MAX_YC                 0x07ff
 #define TOUCHKIT_YC_FUZZ                0x0
 #define TOUCHKIT_YC_FLAT                0x0
-#define TOUCHKIT_REPORT_DATA_SIZE       8
+#define TOUCHKIT_REPORT_DATA_SIZE       16
 
 #define TOUCHKIT_DOWN                   0x01
-#define TOUCHKIT_POINT_TOUCH            0x81
-#define TOUCHKIT_POINT_NOTOUCH          0x80
 
-#define TOUCHKIT_GET_TOUCHED(dat)       ((((dat)[0]) & TOUCHKIT_DOWN) ? 1 : 0)
-#define TOUCHKIT_GET_X(dat)             (((dat)[3] << 7) | (dat)[4])
-#define TOUCHKIT_GET_Y(dat)             (((dat)[1] << 7) | (dat)[2])
+#define TOUCHKIT_PKT_TYPE_MASK          0xFE
+#define TOUCHKIT_PKT_TYPE_REPT          0x80
+#define TOUCHKIT_PKT_TYPE_DIAG          0x0A
 
 #define DRIVER_VERSION                  "v0.1"
 #define DRIVER_AUTHOR                   "Daniel Ritz <daniel.ritz@gmx.ch>"
@@ -62,6 +60,8 @@ MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped.");
 struct touchkit_usb {
         unsigned char *data;
         dma_addr_t data_dma;
+        char buffer[TOUCHKIT_REPORT_DATA_SIZE];
+        int buf_len;
         struct urb *irq;
         struct usb_device *udev;
         struct input_dev *input;
@@ -77,11 +77,128 @@ static struct usb_device_id touchkit_devices[] = {
         {}
 };
 
+/* helpers to read the data */
+static inline int touchkit_get_touched(char *data)
+{
+        return (data[0] & TOUCHKIT_DOWN) ? 1 : 0;
+}
+
+static inline int touchkit_get_x(char *data)
+{
+        return ((data[3] & 0x0F) << 7) | (data[4] & 0x7F);
+}
+
+static inline int touchkit_get_y(char *data)
+{
+        return ((data[1] & 0x0F) << 7) | (data[2] & 0x7F);
+}
+
+
+/* processes one input packet. */
+static void touchkit_process_pkt(struct touchkit_usb *touchkit,
+                                 struct pt_regs *regs, char *pkt)
+{
+        int x, y;
+
+        /* only process report packets */
+        if ((pkt[0] & TOUCHKIT_PKT_TYPE_MASK) != TOUCHKIT_PKT_TYPE_REPT)
+                return;
+
+        if (swap_xy) {
+                y = touchkit_get_x(pkt);
+                x = touchkit_get_y(pkt);
+        } else {
+                x = touchkit_get_x(pkt);
+                y = touchkit_get_y(pkt);
+        }
+
+        input_regs(touchkit->input, regs);
+        input_report_key(touchkit->input, BTN_TOUCH, touchkit_get_touched(pkt));
+        input_report_abs(touchkit->input, ABS_X, x);
+        input_report_abs(touchkit->input, ABS_Y, y);
+        input_sync(touchkit->input);
+}
+
+
+static int touchkit_get_pkt_len(char *buf)
+{
+        switch (buf[0] & TOUCHKIT_PKT_TYPE_MASK) {
+        case TOUCHKIT_PKT_TYPE_REPT:
+                return 5;
+
+        case TOUCHKIT_PKT_TYPE_DIAG:
+                return buf[1] + 2;
+        }
+
+        return 0;
+}
+
+static void touchkit_process(struct touchkit_usb *touchkit, int len,
+                             struct pt_regs *regs)
+{
+        char *buffer;
+        int pkt_len, buf_len, pos;
+
+        /* if the buffer contains data, append */
+        if (unlikely(touchkit->buf_len)) {
+                int tmp;
+
+                /* if only 1 byte in buffer, add another one to get length */
+                if (touchkit->buf_len == 1)
+                        touchkit->buffer[1] = touchkit->data[0];
+
+                pkt_len = touchkit_get_pkt_len(touchkit->buffer);
+
+                /* unknown packet: drop everything */
+                if (!pkt_len)
+                        return;
+
+                /* append, process */
+                tmp = pkt_len - touchkit->buf_len;
+                memcpy(touchkit->buffer + touchkit->buf_len, touchkit->data, tmp);
+                touchkit_process_pkt(touchkit, regs, touchkit->buffer);
+
+                buffer = touchkit->data + tmp;
+                buf_len = len - tmp;
+        } else {
+                buffer = touchkit->data;
+                buf_len = len;
+        }
+
+        /* only one byte left in buffer */
+        if (unlikely(buf_len == 1)) {
+                touchkit->buffer[0] = buffer[0];
+                touchkit->buf_len = 1;
+                return;
+        }
+
+        /* loop over the buffer */
+        pos = 0;
+        while (pos < buf_len) {
+                /* get packet len */
+                pkt_len = touchkit_get_pkt_len(buffer + pos);
+
+                /* unknown packet: drop everything */
+                if (unlikely(!pkt_len))
+                        return;
+
+                /* full packet: process */
+                if (likely(pkt_len <= buf_len)) {
+                        touchkit_process_pkt(touchkit, regs, buffer + pos);
+                } else {
+                        /* incomplete packet: save in buffer */
+                        memcpy(touchkit->buffer, buffer + pos, buf_len - pos);
+                        touchkit->buf_len = buf_len - pos;
+                }
+                pos += pkt_len;
+        }
+}
+
+
 static void touchkit_irq(struct urb *urb, struct pt_regs *regs)
 {
         struct touchkit_usb *touchkit = urb->context;
         int retval;
-        int x, y;
 
         switch (urb->status) {
         case 0:
@@ -105,20 +222,7 @@ static void touchkit_irq(struct urb *urb, struct pt_regs *regs)
                 goto exit;
         }
 
-        if (swap_xy) {
-                y = TOUCHKIT_GET_X(touchkit->data);
-                x = TOUCHKIT_GET_Y(touchkit->data);
-        } else {
-                x = TOUCHKIT_GET_X(touchkit->data);
-                y = TOUCHKIT_GET_Y(touchkit->data);
-        }
-
-        input_regs(touchkit->input, regs);
-        input_report_key(touchkit->input, BTN_TOUCH,
-                         TOUCHKIT_GET_TOUCHED(touchkit->data));
-        input_report_abs(touchkit->input, ABS_X, x);
-        input_report_abs(touchkit->input, ABS_Y, y);
-        input_sync(touchkit->input);
+        touchkit_process(touchkit, urb->actual_length, regs);
 
 exit:
         retval = usb_submit_urb(urb, GFP_ATOMIC);
@@ -267,7 +371,6 @@ static void touchkit_disconnect(struct usb_interface *intf)
 MODULE_DEVICE_TABLE(usb, touchkit_devices);
 
 static struct usb_driver touchkit_driver = {
-        .owner          = THIS_MODULE,
         .name           = "touchkitusb",
         .probe          = touchkit_probe,
         .disconnect     = touchkit_disconnect,
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c
index 226b6f90a907..2f3edc26cb50 100644
--- a/drivers/usb/input/usbkbd.c
+++ b/drivers/usb/input/usbkbd.c
@@ -345,7 +345,6 @@ static struct usb_device_id usb_kbd_id_table [] = {
 MODULE_DEVICE_TABLE (usb, usb_kbd_id_table);
 
 static struct usb_driver usb_kbd_driver = {
-        .owner =        THIS_MODULE,
         .name =         "usbkbd",
         .probe =        usb_kbd_probe,
         .disconnect =   usb_kbd_disconnect,
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c
index 230f6b1b314a..af526135d210 100644
--- a/drivers/usb/input/usbmouse.c
+++ b/drivers/usb/input/usbmouse.c
@@ -226,7 +226,6 @@ static struct usb_device_id usb_mouse_id_table [] = {
 MODULE_DEVICE_TABLE (usb, usb_mouse_id_table);
 
 static struct usb_driver usb_mouse_driver = {
-        .owner          = THIS_MODULE,
         .name           = "usbmouse",
         .probe          = usb_mouse_probe,
         .disconnect     = usb_mouse_disconnect,
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index aea1cfae34cc..48df4cfd5a42 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -854,7 +854,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS);
         input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS);
-        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->y_max, 4, 0);
+        input_set_abs_params(input_dev, ABS_X, 0, wacom->features->x_max, 4, 0);
         input_set_abs_params(input_dev, ABS_Y, 0, wacom->features->y_max, 4, 0);
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
 
@@ -945,7 +945,6 @@ static void wacom_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver wacom_driver = {
-        .owner =        THIS_MODULE,
         .name =         "wacom",
         .probe =        wacom_probe,
         .disconnect =   wacom_disconnect,
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index 43112f040b6d..e278489a80c6 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/usb/input/xpad.c
@@ -70,7 +70,7 @@
 
 #define XPAD_PKT_LEN 32
 
-static struct xpad_device {
+static const struct xpad_device {
         u16 idVendor;
         u16 idProduct;
         char *name;
@@ -81,13 +81,13 @@ static struct xpad_device {
         { 0x0000, 0x0000, "X-Box pad" }
 };
 
-static signed short xpad_btn[] = {
+static const signed short xpad_btn[] = {
         BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z,       /* "analog" buttons */
         BTN_START, BTN_BACK, BTN_THUMBL, BTN_THUMBR,    /* start/back/sticks */
         -1                                              /* terminating entry */
 };
 
-static signed short xpad_abs[] = {
+static const signed short xpad_abs[] = {
         ABS_X, ABS_Y,           /* left stick */
         ABS_RX, ABS_RY,         /* right stick */
         ABS_Z, ABS_RZ,          /* triggers left/right */
@@ -316,7 +316,6 @@ static void xpad_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver xpad_driver = {
-        .owner          = THIS_MODULE,
         .name           = "xpad",
         .probe          = xpad_probe,
         .disconnect     = xpad_disconnect,
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index f526aebea502..1bfc105ad4d6 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -987,7 +987,6 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 }
 
 static struct usb_driver yealink_driver = {
-        .owner          = THIS_MODULE,
         .name           = "yealink",
         .probe          = usb_probe,
         .disconnect     = usb_disconnect,