diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-20 01:18:15 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 02:24:35 -0400 |
commit | 95dd3b30ced3ee740e5dd92fc44515a5a6a350d4 (patch) | |
tree | d934e3570ac794f0dc8166a9bc314402df5337f6 /drivers/input/tablet/wacom.h | |
parent | 8da23fc113e8bdaf813545ec935a6c60254ac439 (diff) |
Input: wacom - get rid of wacom_combo structure
Now that we moved input device from struct wacom to struct wacom_wac,
presence of wacom_combo just complicats things for no good reason.
Let's get rid of it and simply pass URB length to wacom_wac_irq().
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet/wacom.h')
-rw-r--r-- | drivers/input/tablet/wacom.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index 103a8cc29449..56a37074e0dd 100644 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h | |||
@@ -115,14 +115,9 @@ struct wacom { | |||
115 | char phys[32]; | 115 | char phys[32]; |
116 | }; | 116 | }; |
117 | 117 | ||
118 | struct wacom_combo { | ||
119 | struct wacom *wacom; | ||
120 | struct urb *urb; | ||
121 | }; | ||
122 | |||
123 | extern const struct usb_device_id wacom_ids[]; | 118 | extern const struct usb_device_id wacom_ids[]; |
124 | 119 | ||
125 | int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo); | 120 | void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len); |
126 | void wacom_setup_input_capabilities(struct input_dev *input_dev, | 121 | void wacom_setup_input_capabilities(struct input_dev *input_dev, |
127 | struct wacom_wac *wacom_wac); | 122 | struct wacom_wac *wacom_wac); |
128 | __u16 wacom_le16_to_cpu(unsigned char *data); | 123 | __u16 wacom_le16_to_cpu(unsigned char *data); |