diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-30 01:49:08 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-30 01:49:08 -0400 |
| commit | 16a334c0de5a94b1d10a1ac9a33f4dedac89a075 (patch) | |
| tree | bb01b1185d806994cd318a7af68a438a9e57c2a2 /drivers/usb/input/touchkitusb.c | |
| parent | c27a748225fe5c7e485ea471178c26e43f9f7fbe (diff) | |
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 386595ee21c0..4276c24a5080 100644 --- a/drivers/usb/input/touchkitusb.c +++ b/drivers/usb/input/touchkitusb.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define DEBUG | 35 | #define DEBUG |
| 36 | #endif | 36 | #endif |
| 37 | #include <linux/usb.h> | 37 | #include <linux/usb.h> |
| 38 | 38 | #include <linux/usb_input.h> | |
| 39 | 39 | ||
| 40 | #define TOUCHKIT_MIN_XC 0x0 | 40 | #define TOUCHKIT_MIN_XC 0x0 |
| 41 | #define TOUCHKIT_MAX_XC 0x07ff | 41 | #define TOUCHKIT_MAX_XC 0x07ff |
| @@ -202,10 +202,7 @@ static int touchkit_probe(struct usb_interface *intf, | |||
| 202 | 202 | ||
| 203 | touchkit->input.name = touchkit->name; | 203 | touchkit->input.name = touchkit->name; |
| 204 | touchkit->input.phys = touchkit->phys; | 204 | touchkit->input.phys = touchkit->phys; |
| 205 | touchkit->input.id.bustype = BUS_USB; | 205 | usb_to_input_id(udev, &touchkit->input.id); |
| 206 | touchkit->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor); | ||
| 207 | touchkit->input.id.product = le16_to_cpu(udev->descriptor.idProduct); | ||
| 208 | touchkit->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice); | ||
| 209 | touchkit->input.dev = &intf->dev; | 206 | touchkit->input.dev = &intf->dev; |
| 210 | 207 | ||
| 211 | touchkit->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 208 | touchkit->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |