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>

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 {
         char phys[32];
 };
 
-struct wacom_combo {
-        struct wacom *wacom;
-        struct urb *urb;
-};
-
 extern const struct usb_device_id wacom_ids[];
 
-int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo);
+void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len);
 void wacom_setup_input_capabilities(struct input_dev *input_dev,
                                     struct wacom_wac *wacom_wac);
 __u16 wacom_le16_to_cpu(unsigned char *data);