14 files changed, 33 insertions, 62 deletions

diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index ebcf7c955800..13532f3e3efc 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -31,6 +31,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 /*
  * Version Information
@@ -87,8 +88,8 @@ static void usb_acecad_irq(struct urb *urb, struct pt_regs *regs)
         if (prox) {
                 int x = data[1] | (data[2] << 8);
                 int y = data[3] | (data[4] << 8);
-                /*Pressure should compute the same way for flair and 302*/
-                int pressure = data[5] | ((int)data[6] << 8);
+                /* Pressure should compute the same way for flair and 302 */
+                int pressure = data[5] | (data[6] << 8);
                 int touch = data[0] & 0x01;
                 int stylus = (data[0] & 0x10) >> 4;
                 int stylus2 = (data[0] & 0x20) >> 5;
@@ -104,9 +105,9 @@ static void usb_acecad_irq(struct urb *urb, struct pt_regs *regs)
         input_sync(dev);
 
 resubmit:
-        status = usb_submit_urb (urb, GFP_ATOMIC);
+        status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status)
-                err ("can't resubmit intr, %s-%s/input0, status %d",
+                err("can't resubmit intr, %s-%s/input0, status %d",
                         acecad->usbdev->bus->bus_name, acecad->usbdev->devpath, status);
 }
 
@@ -212,10 +213,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
 
         acecad->dev.name = acecad->name;
         acecad->dev.phys = acecad->phys;
-        acecad->dev.id.bustype = BUS_USB;
-        acecad->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-        acecad->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
-        acecad->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+        usb_to_input_id(dev, &acecad->dev.id);
         acecad->dev.dev = &intf->dev;
 
         usb_fill_int_urb(acecad->irq, dev, pipe,
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 6bb0f25e8e93..cd0cbfe20723 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -77,6 +77,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 #include <linux/sched.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
@@ -2125,10 +2126,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
         aiptek->inputdev.absflat[ABS_WHEEL] = 0;
         aiptek->inputdev.name = "Aiptek";
         aiptek->inputdev.phys = aiptek->features.usbPath;
-        aiptek->inputdev.id.bustype = BUS_USB;
-        aiptek->inputdev.id.vendor = le16_to_cpu(usbdev->descriptor.idVendor);
-        aiptek->inputdev.id.product = le16_to_cpu(usbdev->descriptor.idProduct);
-        aiptek->inputdev.id.version = le16_to_cpu(usbdev->descriptor.bcdDevice);
+        usb_to_input_id(usbdev, &aiptek->inputdev.id);
         aiptek->inputdev.dev = &intf->dev;
 
         aiptek->usbdev = usbdev;
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 654ac454744d..fd99681ee483 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -94,6 +94,7 @@
 #include <linux/moduleparam.h>
 #include <linux/input.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 #include <linux/wait.h>
 
 /*
@@ -635,11 +636,8 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
         idev->name = ati_remote->name;
         idev->phys = ati_remote->phys;
 
-        idev->id.bustype = BUS_USB;
-        idev->id.vendor = le16_to_cpu(ati_remote->udev->descriptor.idVendor);
-        idev->id.product = le16_to_cpu(ati_remote->udev->descriptor.idProduct);
-        idev->id.version = le16_to_cpu(ati_remote->udev->descriptor.bcdDevice);
-        idev->dev = &(ati_remote->udev->dev);
+        usb_to_input_id(ati_remote->udev, &idev->id);
+        idev->dev = &ati_remote->udev->dev;
 }
 
 static int ati_remote_initialize(struct ati_remote *ati_remote)
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 9ac1e9095334..e071c8eeccee 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 #undef DEBUG
 
@@ -581,10 +582,7 @@ int hidinput_connect(struct hid_device *hid)
                                 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 = le16_to_cpu(dev->descriptor.idVendor);
-                                hidinput->input.id.product = le16_to_cpu(dev->descriptor.idProduct);
-                                hidinput->input.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+                                usb_to_input_id(dev, &hidinput->input.id);
                                 hidinput->input.dev = &hid->intf->dev;
                         }
 
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 47dec6a1b344..0dc439f10823 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -53,6 +53,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 /* only an 8 byte buffer necessary for a single packet */
 #define ITM_BUFSIZE                     8
@@ -184,10 +185,7 @@ static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id
 
         itmtouch->inputdev.name = itmtouch->name;
         itmtouch->inputdev.phys = itmtouch->phys;
-        itmtouch->inputdev.id.bustype = BUS_USB;
-        itmtouch->inputdev.id.vendor = udev->descriptor.idVendor;
-        itmtouch->inputdev.id.product = udev->descriptor.idProduct;
-        itmtouch->inputdev.id.version = udev->descriptor.bcdDevice;
+        usb_to_input_id(udev, &itmtouch->inputdev.id);
         itmtouch->inputdev.dev = &intf->dev;
 
         if (!strlen(itmtouch->name))
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index d2f0f90a9bcd..b6f6ac8d9c2f 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -4,6 +4,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 #include <asm/unaligned.h>
 #include <asm/byteorder.h>
 
@@ -167,10 +168,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         kbtab->dev.name = "KB Gear Tablet";
         kbtab->dev.phys = kbtab->phys;
-        kbtab->dev.id.bustype = BUS_USB;
-        kbtab->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-        kbtab->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
-        kbtab->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+        usb_to_input_id(dev, &kbtab->dev.id);
         kbtab->dev.dev = &intf->dev;
         kbtab->usbdev = dev;
 
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c
index 09b5cc7c66de..ff9275057a18 100644
--- a/drivers/usb/input/mtouchusb.c
+++ b/drivers/usb/input/mtouchusb.c
@@ -53,6 +53,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 #define MTOUCHUSB_MIN_XC                0x0
 #define MTOUCHUSB_MAX_RAW_XC            0x4000
@@ -232,10 +233,7 @@ static int mtouchusb_probe(struct usb_interface *intf, const struct usb_device_i
 
         mtouch->input.name = mtouch->name;
         mtouch->input.phys = mtouch->phys;
-        mtouch->input.id.bustype = BUS_USB;
-        mtouch->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor);
-        mtouch->input.id.product = le16_to_cpu(udev->descriptor.idProduct);
-        mtouch->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
+        usb_to_input_id(udev, &mtouch->input.id);
         mtouch->input.dev = &intf->dev;
 
         mtouch->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index 3975b309d55f..ad4afe7e5897 100644
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 #define POWERMATE_VENDOR        0x077d  /* Griffin Technology, Inc. */
 #define POWERMATE_PRODUCT_NEW   0x0410  /* Griffin PowerMate */
@@ -389,10 +390,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
         pm->input.keybit[LONG(BTN_0)] = BIT(BTN_0);
         pm->input.relbit[LONG(REL_DIAL)] = BIT(REL_DIAL);
         pm->input.mscbit[LONG(MSC_PULSELED)] = BIT(MSC_PULSELED);
-        pm->input.id.bustype = BUS_USB;
-        pm->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor);
-        pm->input.id.product = le16_to_cpu(udev->descriptor.idProduct);
-        pm->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
+        usb_to_input_id(udev, &pm->input.id);
         pm->input.event = powermate_input_event;
         pm->input.dev = &intf->dev;
         pm->input.phys = pm->phys;
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
index 386595ee21c0..4276c24a5080 100644
--- a/drivers/usb/input/touchkitusb.c
+++ b/drivers/usb/input/touchkitusb.c
@@ -35,7 +35,7 @@
 #define DEBUG
 #endif
 #include <linux/usb.h>
-
+#include <linux/usb_input.h>
 
 #define TOUCHKIT_MIN_XC                 0x0
 #define TOUCHKIT_MAX_XC                 0x07ff
@@ -202,10 +202,7 @@ static int touchkit_probe(struct usb_interface *intf,
 
         touchkit->input.name = touchkit->name;
         touchkit->input.phys = touchkit->phys;
-        touchkit->input.id.bustype = BUS_USB;
-        touchkit->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor);
-        touchkit->input.id.product = le16_to_cpu(udev->descriptor.idProduct);
-        touchkit->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
+        usb_to_input_id(udev, &touchkit->input.id);
         touchkit->input.dev = &intf->dev;
 
         touchkit->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c
index f35db1974c42..28987f15eeee 100644
--- a/drivers/usb/input/usbkbd.c
+++ b/drivers/usb/input/usbkbd.c
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 /*
  * Version Information
@@ -288,10 +289,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
 
         kbd->dev.name = kbd->name;
         kbd->dev.phys = kbd->phys;
-        kbd->dev.id.bustype = BUS_USB;
-        kbd->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-        kbd->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
-        kbd->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+        usb_to_input_id(dev, &kbd->dev.id);
         kbd->dev.dev = &iface->dev;
 
         if (dev->manufacturer)
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c
index 1ec41b5effe6..4104dec847fb 100644
--- a/drivers/usb/input/usbmouse.c
+++ b/drivers/usb/input/usbmouse.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 /*
  * Version Information
@@ -171,10 +172,7 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_
 
         mouse->dev.name = mouse->name;
         mouse->dev.phys = mouse->phys;
-        mouse->dev.id.bustype = BUS_USB;
-        mouse->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-        mouse->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
-        mouse->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+        usb_to_input_id(dev, &mouse->dev.id);
         mouse->dev.dev = &intf->dev;
 
         if (dev->manufacturer)
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index f6b34af66b3d..02412e31a46b 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -69,6 +69,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 #include <asm/unaligned.h>
 #include <asm/byteorder.h>
 
@@ -823,10 +824,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         wacom->dev.name = wacom->features->name;
         wacom->dev.phys = wacom->phys;
-        wacom->dev.id.bustype = BUS_USB;
-        wacom->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-        wacom->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
-        wacom->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+        usb_to_input_id(dev, &wacom->dev.id);
         wacom->dev.dev = &intf->dev;
         wacom->usbdev = dev;
 
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index a7fa1b17dcfe..18125e0bffa2 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/usb/input/xpad.c
@@ -62,6 +62,7 @@
 #include <linux/module.h>
 #include <linux/smp_lock.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 
 #define DRIVER_VERSION "v0.0.5"
 #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>"
@@ -256,10 +257,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         xpad->udev = udev;
 
-        xpad->dev.id.bustype = BUS_USB;
-        xpad->dev.id.vendor = le16_to_cpu(udev->descriptor.idVendor);
-        xpad->dev.id.product = le16_to_cpu(udev->descriptor.idProduct);
-        xpad->dev.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
+        usb_to_input_id(udev, &xpad->dev.id);
         xpad->dev.dev = &intf->dev;
         xpad->dev.private = xpad;
         xpad->dev.name = xpad_device[i].name;
diff --git a/drivers/usb/media/konicawc.c b/drivers/usb/media/konicawc.c
index 08521a2b4f3d..20ac9e1069d4 100644
--- a/drivers/usb/media/konicawc.c
+++ b/drivers/usb/media/konicawc.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/usb_input.h>
 
 #include "usbvideo.h"
 
@@ -845,10 +846,7 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id
                 cam->input.private = cam;
                 cam->input.evbit[0] = BIT(EV_KEY);
                 cam->input.keybit[LONG(BTN_0)] = BIT(BTN_0);
-                cam->input.id.bustype = BUS_USB;
-                cam->input.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-                cam->input.id.product = le16_to_cpu(dev->descriptor.idProduct);
-                cam->input.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+                usb_to_input_id(dev, &cam->input.id);
                 input_register_device(&cam->input);
                 
                 usb_make_path(dev, cam->input_physname, 56);