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/mtouchusb.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/mtouchusb.c')
-rw-r--r-- | drivers/usb/input/mtouchusb.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ | |||
53 | #include <linux/module.h> | 53 | #include <linux/module.h> |
54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
55 | #include <linux/usb.h> | 55 | #include <linux/usb.h> |
56 | #include <linux/usb_input.h> | ||
56 | 57 | ||
57 | #define MTOUCHUSB_MIN_XC 0x0 | 58 | #define MTOUCHUSB_MIN_XC 0x0 |
58 | #define MTOUCHUSB_MAX_RAW_XC 0x4000 | 59 | #define MTOUCHUSB_MAX_RAW_XC 0x4000 |
@@ -232,10 +233,7 @@ static int mtouchusb_probe(struct usb_interface *intf, const struct usb_device_i | |||
232 | 233 | ||
233 | mtouch->input.name = mtouch->name; | 234 | mtouch->input.name = mtouch->name; |
234 | mtouch->input.phys = mtouch->phys; | 235 | mtouch->input.phys = mtouch->phys; |
235 | mtouch->input.id.bustype = BUS_USB; | 236 | usb_to_input_id(udev, &mtouch->input.id); |
236 | mtouch->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor); | ||
237 | mtouch->input.id.product = le16_to_cpu(udev->descriptor.idProduct); | ||
238 | mtouch->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice); | ||
239 | mtouch->input.dev = &intf->dev; | 237 | mtouch->input.dev = &intf->dev; |
240 | 238 | ||
241 | mtouch->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 239 | mtouch->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |