diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-30 00:49:08 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-30 00:49:08 -0500 |
| commit | 16a334c0de5a94b1d10a1ac9a33f4dedac89a075 (patch) | |
| tree | bb01b1185d806994cd318a7af68a438a9e57c2a2 /drivers/usb/input/touchkitusb.c | |
| parent | c27a748225fe5c7e485ea471178c26e43f9f7fbe (diff) | |
| download | op-kernel-dev-16a334c0de5a94b1d10a1ac9a33f4dedac89a075.zip op-kernel-dev-16a334c0de5a94b1d10a1ac9a33f4dedac89a075.tar.gz | |
Input: introduce usb_to_input_id() to uniformly produce
struct input_id for USB input devices.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/usb/input/touchkitusb.c')
| -rw-r--r-- | drivers/usb/input/touchkitusb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c index 386595e..4276c24 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); |
