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/ati_remote.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/ati_remote.c')
-rw-r--r-- | drivers/usb/input/ati_remote.c | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ | |||
94 | #include <linux/moduleparam.h> | 94 | #include <linux/moduleparam.h> |
95 | #include <linux/input.h> | 95 | #include <linux/input.h> |
96 | #include <linux/usb.h> | 96 | #include <linux/usb.h> |
97 | #include <linux/usb_input.h> | ||
97 | #include <linux/wait.h> | 98 | #include <linux/wait.h> |
98 | 99 | ||
99 | /* | 100 | /* |
@@ -635,11 +636,8 @@ static void ati_remote_input_init(struct ati_remote *ati_remote) | |||
635 | idev->name = ati_remote->name; | 636 | idev->name = ati_remote->name; |
636 | idev->phys = ati_remote->phys; | 637 | idev->phys = ati_remote->phys; |
637 | 638 | ||
638 | idev->id.bustype = BUS_USB; | 639 | usb_to_input_id(ati_remote->udev, &idev->id); |
639 | idev->id.vendor = le16_to_cpu(ati_remote->udev->descriptor.idVendor); | 640 | idev->dev = &ati_remote->udev->dev; |
640 | idev->id.product = le16_to_cpu(ati_remote->udev->descriptor.idProduct); | ||
641 | idev->id.version = le16_to_cpu(ati_remote->udev->descriptor.bcdDevice); | ||
642 | idev->dev = &(ati_remote->udev->dev); | ||
643 | } | 641 | } |
644 | 642 | ||
645 | static int ati_remote_initialize(struct ati_remote *ati_remote) | 643 | static int ati_remote_initialize(struct ati_remote *ati_remote) |