1 files changed, 109 insertions, 207 deletions

diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index f46502589e4e..d90f4e00e51d 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -11,8 +11,8 @@
  * (at your option) any later version.
  */
 
-#include "wacom.h"
 #include "wacom_wac.h"
+#include "wacom.h"
 
 /* defines to get HID report descriptor */
 #define HID_DEVICET_HID         (USB_TYPE_CLASS | 0x01)
@@ -70,15 +70,9 @@ static int usb_set_report(struct usb_interface *intf, unsigned char type,
                 buf, size, 1000);
 }
 
-static struct input_dev * get_input_dev(struct wacom_combo *wcombo)
-{
-        return wcombo->wacom->dev;
-}
-
 static void wacom_sys_irq(struct urb *urb)
 {
         struct wacom *wacom = urb->context;
-        struct wacom_combo wcombo;
         int retval;
 
         switch (urb->status) {
@@ -96,59 +90,16 @@ static void wacom_sys_irq(struct urb *urb)
                 goto exit;
         }
 
-        wcombo.wacom = wacom;
-        wcombo.urb = urb;
-
-        if (wacom_wac_irq(wacom->wacom_wac, (void *)&wcombo))
-                input_sync(get_input_dev(&wcombo));
+        wacom_wac_irq(&wacom->wacom_wac, urb->actual_length);
 
  exit:
         usb_mark_last_busy(wacom->usbdev);
-        retval = usb_submit_urb (urb, GFP_ATOMIC);
+        retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
                 err ("%s - usb_submit_urb failed with result %d",
                      __func__, retval);
 }
 
-void wacom_report_key(void *wcombo, unsigned int key_type, int key_data)
-{
-        input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data);
-}
-
-void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data)
-{
-        input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data);
-}
-
-void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data)
-{
-        input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data);
-}
-
-void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value)
-{
-        input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value);
-}
-
-__u16 wacom_be16_to_cpu(unsigned char *data)
-{
-        __u16 value;
-        value = be16_to_cpu(*(__be16 *) data);
-        return value;
-}
-
-__u16 wacom_le16_to_cpu(unsigned char *data)
-{
-        __u16 value;
-        value = le16_to_cpu(*(__le16 *) data);
-        return value;
-}
-
-void wacom_input_sync(void *wcombo)
-{
-        input_sync(get_input_dev((struct wacom_combo *)wcombo));
-}
-
 static int wacom_open(struct input_dev *dev)
 {
         struct wacom *wacom = input_get_drvdata(dev);
@@ -168,7 +119,7 @@ static int wacom_open(struct input_dev *dev)
                 return -EIO;
         }
 
-        wacom->open = 1;
+        wacom->open = true;
         wacom->intf->needs_remote_wakeup = 1;
 
         mutex_unlock(&wacom->lock);
@@ -181,128 +132,11 @@ static void wacom_close(struct input_dev *dev)
 
         mutex_lock(&wacom->lock);
         usb_kill_urb(wacom->irq);
-        wacom->open = 0;
+        wacom->open = false;
         wacom->intf->needs_remote_wakeup = 0;
         mutex_unlock(&wacom->lock);
 }
 
-void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) |
-                BIT_MASK(BTN_5);
-        input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
-}
-
-void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->evbit[0] |= BIT_MASK(EV_MSC);
-        input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) |
-                BIT_MASK(BTN_4);
-}
-
-void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->evbit[0] |= BIT_MASK(EV_REL);
-        input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
-        input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
-                BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |
-                BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);
-        input_set_abs_params(input_dev, ABS_DISTANCE,
-                             0, wacom_wac->features.distance_max, 0, 0);
-}
-
-void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) |
-                BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
-        input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
-        input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
-}
-
-void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) |
-                BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7);
-        input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
-}
-
-void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) | BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) | BIT_MASK(BTN_5) | BIT_MASK(BTN_6);
-        input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
-}
-
-void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_7) | BIT_MASK(BTN_8);
-}
-
-void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
-}
-
-void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);
-        input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
-        input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
-        input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |
-                BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
-                BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |
-                BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) |
-                BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) |
-                BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2);
-        input_set_abs_params(input_dev, ABS_DISTANCE,
-                             0, wacom_wac->features.distance_max, 0, 0);
-        input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0);
-        input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0);
-        input_set_abs_params(input_dev, ABS_TILT_Y, 0, 127, 0, 0);
-        input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);
-        input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0, 0);
-}
-
-void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
-                BIT_MASK(BTN_STYLUS) | BIT_MASK(BTN_STYLUS2);
-}
-
-void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER);
-}
-
-void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        struct wacom_features *features = &wacom_wac->features;
-
-        if (features->device_type == BTN_TOOL_DOUBLETAP ||
-            features->device_type == BTN_TOOL_TRIPLETAP) {
-                input_set_abs_params(input_dev, ABS_RX, 0, features->x_phy, 0, 0);
-                input_set_abs_params(input_dev, ABS_RY, 0, features->y_phy, 0, 0);
-                __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
-        }
-}
-
-void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
-{
-        if (wacom_wac->features.device_type == BTN_TOOL_TRIPLETAP) {
-                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP);
-                input_dev->evbit[0] |= BIT_MASK(EV_MSC);
-                input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
-        }
-}
-
 static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc,
                            struct wacom_features *features)
 {
@@ -362,9 +196,9 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                                                         features->device_type = BTN_TOOL_TRIPLETAP;
                                                 }
                                                 features->x_max =
-                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                        get_unaligned_le16(&report[i + 3]);
                                                 features->x_phy =
-                                                        wacom_le16_to_cpu(&report[i + 6]);
+                                                        get_unaligned_le16(&report[i + 6]);
                                                 features->unit = report[i + 9];
                                                 features->unitExpo = report[i + 11];
                                                 i += 12;
@@ -374,7 +208,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                                                         features->pktlen = WACOM_PKGLEN_GRAPHIRE;
                                                 features->device_type = BTN_TOOL_PEN;
                                                 features->x_max =
-                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                        get_unaligned_le16(&report[i + 3]);
                                                 i += 4;
                                         }
                                 } else if (usage == WCM_DIGITIZER) {
@@ -396,15 +230,15 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                                                         features->pktlen = WACOM_PKGLEN_TPC2FG;
                                                         features->device_type = BTN_TOOL_TRIPLETAP;
                                                         features->y_max =
-                                                                wacom_le16_to_cpu(&report[i + 3]);
+                                                                get_unaligned_le16(&report[i + 3]);
                                                         features->y_phy =
-                                                                wacom_le16_to_cpu(&report[i + 6]);
+                                                                get_unaligned_le16(&report[i + 6]);
                                                         i += 7;
                                                 } else {
                                                         features->y_max =
                                                                 features->x_max;
                                                         features->y_phy =
-                                                                wacom_le16_to_cpu(&report[i + 3]);
+                                                                get_unaligned_le16(&report[i + 3]);
                                                         i += 4;
                                                 }
                                         } else if (pen) {
@@ -413,7 +247,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                                                         features->pktlen = WACOM_PKGLEN_GRAPHIRE;
                                                 features->device_type = BTN_TOOL_PEN;
                                                 features->y_max =
-                                                        wacom_le16_to_cpu(&report[i + 3]);
+                                                        get_unaligned_le16(&report[i + 3]);
                                                 i += 4;
                                         }
                                 }
@@ -432,7 +266,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
                         case HID_USAGE_UNDEFINED:
                                 if (usage == WCM_DESKTOP && finger) /* capacity */
                                         features->pressure_max =
-                                                wacom_le16_to_cpu(&report[i + 3]);
+                                                get_unaligned_le16(&report[i + 3]);
                                 i += 4;
                                 break;
                         }
@@ -528,6 +362,81 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf,
         return error;
 }
 
+struct wacom_usbdev_data {
+        struct list_head list;
+        struct kref kref;
+        struct usb_device *dev;
+        struct wacom_shared shared;
+};
+
+static LIST_HEAD(wacom_udev_list);
+static DEFINE_MUTEX(wacom_udev_list_lock);
+
+static struct wacom_usbdev_data *wacom_get_usbdev_data(struct usb_device *dev)
+{
+        struct wacom_usbdev_data *data;
+
+        list_for_each_entry(data, &wacom_udev_list, list) {
+                if (data->dev == dev) {
+                        kref_get(&data->kref);
+                        return data;
+                }
+        }
+
+        return NULL;
+}
+
+static int wacom_add_shared_data(struct wacom_wac *wacom,
+                                 struct usb_device *dev)
+{
+        struct wacom_usbdev_data *data;
+        int retval = 0;
+
+        mutex_lock(&wacom_udev_list_lock);
+
+        data = wacom_get_usbdev_data(dev);
+        if (!data) {
+                data = kzalloc(sizeof(struct wacom_usbdev_data), GFP_KERNEL);
+                if (!data) {
+                        retval = -ENOMEM;
+                        goto out;
+                }
+
+                kref_init(&data->kref);
+                data->dev = dev;
+                list_add_tail(&data->list, &wacom_udev_list);
+        }
+
+        wacom->shared = &data->shared;
+
+out:
+        mutex_unlock(&wacom_udev_list_lock);
+        return retval;
+}
+
+static void wacom_release_shared_data(struct kref *kref)
+{
+        struct wacom_usbdev_data *data =
+                container_of(kref, struct wacom_usbdev_data, kref);
+
+        mutex_lock(&wacom_udev_list_lock);
+        list_del(&data->list);
+        mutex_unlock(&wacom_udev_list_lock);
+
+        kfree(data);
+}
+
+static void wacom_remove_shared_data(struct wacom_wac *wacom)
+{
+        struct wacom_usbdev_data *data;
+
+        if (wacom->shared) {
+                data = container_of(wacom->shared, struct wacom_usbdev_data, shared);
+                kref_put(&data->kref, wacom_release_shared_data);
+                wacom->shared = NULL;
+        }
+}
+
 static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
@@ -542,13 +451,13 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                 return -EINVAL;
 
         wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
-        wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL);
         input_dev = input_allocate_device();
-        if (!wacom || !input_dev || !wacom_wac) {
+        if (!wacom || !input_dev) {
                 error = -ENOMEM;
                 goto fail1;
         }
 
+        wacom_wac = &wacom->wacom_wac;
         wacom_wac->features = *((struct wacom_features *)id->driver_info);
         features = &wacom_wac->features;
         if (features->pktlen > WACOM_PKGLEN_MAX) {
@@ -570,20 +479,12 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         }
 
         wacom->usbdev = dev;
-        wacom->dev = input_dev;
         wacom->intf = intf;
         mutex_init(&wacom->lock);
         usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
         strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
-        usb_to_input_id(dev, &input_dev->id);
-
-        input_dev->dev.parent = &intf->dev;
-
-        input_set_drvdata(input_dev, wacom);
-
-        input_dev->open = wacom_open;
-        input_dev->close = wacom_close;
+        wacom_wac->input = input_dev;
 
         endpoint = &intf->cur_altsetting->endpoint[0].desc;
 
@@ -600,20 +501,21 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
                         features->device_type == BTN_TOOL_PEN ?
                                 " Pen" : " Finger",
                         sizeof(wacom_wac->name));
+
+                error = wacom_add_shared_data(wacom_wac, dev);
+                if (error)
+                        goto fail3;
         }
 
         input_dev->name = wacom_wac->name;
-        wacom->wacom_wac = wacom_wac;
-
-        input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOUCH);
-
-        input_set_abs_params(input_dev, ABS_X, 0, features->x_max, 4, 0);
-        input_set_abs_params(input_dev, ABS_Y, 0, features->y_max, 4, 0);
-        input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max, 0, 0);
-        input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
+        input_dev->name = wacom_wac->name;
+        input_dev->dev.parent = &intf->dev;
+        input_dev->open = wacom_open;
+        input_dev->close = wacom_close;
+        usb_to_input_id(dev, &input_dev->id);
+        input_set_drvdata(input_dev, wacom);
 
-        wacom_init_input_dev(input_dev, wacom_wac);
+        wacom_setup_input_capabilities(input_dev, wacom_wac);
 
         usb_fill_int_urb(wacom->irq, dev,
                          usb_rcvintpipe(dev, endpoint->bEndpointAddress),
@@ -622,9 +524,9 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         wacom->irq->transfer_dma = wacom->data_dma;
         wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-        error = input_register_device(wacom->dev);
+        error = input_register_device(input_dev);
         if (error)
-                goto fail3;
+                goto fail4;
 
         /* Note that if query fails it is not a hard failure */
         wacom_query_tablet_data(intf, features);
@@ -632,11 +534,11 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         usb_set_intfdata(intf, wacom);
         return 0;
 
+ fail4: wacom_remove_shared_data(wacom_wac);
  fail3: usb_free_urb(wacom->irq);
  fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
  fail1: input_free_device(input_dev);
         kfree(wacom);
-        kfree(wacom_wac);
         return error;
 }
 
@@ -647,11 +549,11 @@ static void wacom_disconnect(struct usb_interface *intf)
         usb_set_intfdata(intf, NULL);
 
         usb_kill_urb(wacom->irq);
-        input_unregister_device(wacom->dev);
+        input_unregister_device(wacom->wacom_wac.input);
         usb_free_urb(wacom->irq);
         usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
-                        wacom->wacom_wac->data, wacom->data_dma);
-        kfree(wacom->wacom_wac);
+                        wacom->wacom_wac.data, wacom->data_dma);
+        wacom_remove_shared_data(&wacom->wacom_wac);
         kfree(wacom);
 }
 
@@ -669,7 +571,7 @@ static int wacom_suspend(struct usb_interface *intf, pm_message_t message)
 static int wacom_resume(struct usb_interface *intf)
 {
         struct wacom *wacom = usb_get_intfdata(intf);
-        struct wacom_features *features = &wacom->wacom_wac->features;
+        struct wacom_features *features = &wacom->wacom_wac.features;
         int rv;
 
         mutex_lock(&wacom->lock);