Merge branch 'next' into for-linus

8 files changed, 29 insertions, 123 deletions

diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c
index d94f7e9aa997..f8b0b1df9138 100644
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@ -269,19 +269,4 @@ static struct usb_driver usb_acecad_driver = {
         .id_table =     usb_acecad_id_table,
 };
 
-static int __init usb_acecad_init(void)
-{
-        int result = usb_register(&usb_acecad_driver);
-        if (result == 0)
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                       DRIVER_DESC "\n");
-        return result;
-}
-
-static void __exit usb_acecad_exit(void)
-{
-        usb_deregister(&usb_acecad_driver);
-}
-
-module_init(usb_acecad_init);
-module_exit(usb_acecad_exit);
+module_usb_driver(usb_acecad_driver);
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 85bace2c8fe8..205d16aab441 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1923,21 +1923,7 @@ static struct usb_driver aiptek_driver = {
         .id_table = aiptek_ids,
 };
 
-static int __init aiptek_init(void)
-{
-        int result = usb_register(&aiptek_driver);
-        if (result == 0) {
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                       DRIVER_DESC "\n");
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");
-        }
-        return result;
-}
-
-static void __exit aiptek_exit(void)
-{
-        usb_deregister(&aiptek_driver);
-}
+module_usb_driver(aiptek_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -1947,6 +1933,3 @@ module_param(programmableDelay, int, 0);
 MODULE_PARM_DESC(programmableDelay, "delay used during tablet programming");
 module_param(jitterDelay, int, 0);
 MODULE_PARM_DESC(jitterDelay, "stylus/mouse settlement delay");
-
-module_init(aiptek_init);
-module_exit(aiptek_exit);
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 8ea6afe2e992..89a297801dce 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -1022,33 +1022,7 @@ static struct usb_driver gtco_driverinfo_table = {
         .disconnect     = gtco_disconnect,
 };
 
-/*
- *  Register this module with the USB subsystem
- */
-static int __init gtco_init(void)
-{
-        int error;
-
-        error = usb_register(&gtco_driverinfo_table);
-        if (error) {
-                err("usb_register() failed rc=0x%x", error);
-                return error;
-        }
-
-        printk("GTCO usb driver version: %s", GTCO_VERSION);
-        return 0;
-}
-
-/*
- *   Deregister this module with the USB subsystem
- */
-static void __exit gtco_exit(void)
-{
-        usb_deregister(&gtco_driverinfo_table);
-}
-
-module_init(gtco_init);
-module_exit(gtco_exit);
+module_usb_driver(gtco_driverinfo_table);
 
 MODULE_DESCRIPTION("GTCO digitizer USB driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/input/tablet/hanwang.c b/drivers/input/tablet/hanwang.c
index 6504b627b234..b2db3cfe3084 100644
--- a/drivers/input/tablet/hanwang.c
+++ b/drivers/input/tablet/hanwang.c
@@ -432,15 +432,4 @@ static struct usb_driver hanwang_driver = {
         .id_table       = hanwang_ids,
 };
 
-static int __init hanwang_init(void)
-{
-        return usb_register(&hanwang_driver);
-}
-
-static void __exit hanwang_exit(void)
-{
-        usb_deregister(&hanwang_driver);
-}
-
-module_init(hanwang_init);
-module_exit(hanwang_exit);
+module_usb_driver(hanwang_driver);
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index 290f4e57b589..85a5b40333ac 100644
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -198,22 +198,4 @@ static struct usb_driver kbtab_driver = {
         .id_table =     kbtab_ids,
 };
 
-static int __init kbtab_init(void)
-{
-        int retval;
-        retval = usb_register(&kbtab_driver);
-        if (retval)
-                goto out;
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-out:
-        return retval;
-}
-
-static void __exit kbtab_exit(void)
-{
-        usb_deregister(&kbtab_driver);
-}
-
-module_init(kbtab_init);
-module_exit(kbtab_exit);
+module_usb_driver(kbtab_driver);
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index b59058998417..ca28066dc81e 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -176,7 +176,7 @@ static int wacom_parse_logical_collection(unsigned char *report,
 
                 /* Logical collection is only used by 3rd gen Bamboo Touch */
                 features->pktlen = WACOM_PKGLEN_BBTOUCH3;
-                features->device_type = BTN_TOOL_DOUBLETAP;
+                features->device_type = BTN_TOOL_FINGER;
 
                 /*
                  * Stylus and Touch have same active area
@@ -286,12 +286,10 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                                 if (features->type == TABLETPC2FG) {
                                                         /* need to reset back */
                                                         features->pktlen = WACOM_PKGLEN_TPC2FG;
-                                                        features->device_type = BTN_TOOL_DOUBLETAP;
                                                 }
                                                 if (features->type == BAMBOO_PT) {
                                                         /* need to reset back */
                                                         features->pktlen = WACOM_PKGLEN_BBTOUCH;
-                                                        features->device_type = BTN_TOOL_DOUBLETAP;
                                                         features->x_phy =
                                                                 get_unaligned_le16(&report[i + 5]);
                                                         features->x_max =
@@ -325,7 +323,6 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                                 if (features->type == TABLETPC2FG) {
                                                         /* need to reset back */
                                                         features->pktlen = WACOM_PKGLEN_TPC2FG;
-                                                        features->device_type = BTN_TOOL_DOUBLETAP;
                                                         features->y_max =
                                                                 get_unaligned_le16(&report[i + 3]);
                                                         features->y_phy =
@@ -334,7 +331,6 @@ static int wacom_parse_hid(struct usb_interface *intf,
                                                 } else if (features->type == BAMBOO_PT) {
                                                         /* need to reset back */
                                                         features->pktlen = WACOM_PKGLEN_BBTOUCH;
-                                                        features->device_type = BTN_TOOL_DOUBLETAP;
                                                         features->y_phy =
                                                                 get_unaligned_le16(&report[i + 3]);
                                                         features->y_max =
@@ -1000,21 +996,4 @@ static struct usb_driver wacom_driver = {
         .supports_autosuspend = 1,
 };
 
-static int __init wacom_init(void)
-{
-        int result;
-
-        result = usb_register(&wacom_driver);
-        if (result == 0)
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                       DRIVER_DESC "\n");
-        return result;
-}
-
-static void __exit wacom_exit(void)
-{
-        usb_deregister(&wacom_driver);
-}
-
-module_init(wacom_init);
-module_exit(wacom_exit);
+module_usb_driver(wacom_driver);
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index cd3ed29e0801..89a96427faa0 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -832,12 +832,24 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
 
         dbg("wacom_tpc_irq: received report #%d", data[0]);
 
-        if (len == WACOM_PKGLEN_TPC1FG || data[0] == WACOM_REPORT_TPC1FG)
-                return wacom_tpc_single_touch(wacom, len);
-        else if (data[0] == WACOM_REPORT_TPC2FG)
-                return wacom_tpc_mt_touch(wacom);
-        else if (data[0] == WACOM_REPORT_PENABLED)
-                return wacom_tpc_pen(wacom);
+        switch (len) {
+        case WACOM_PKGLEN_TPC1FG:
+                 return wacom_tpc_single_touch(wacom, len);
+
+        case WACOM_PKGLEN_TPC2FG:
+                return wacom_tpc_mt_touch(wacom);
+
+        default:
+                switch (data[0]) {
+                case WACOM_REPORT_TPC1FG:
+                case WACOM_REPORT_TPCHID:
+                case WACOM_REPORT_TPCST:
+                        return wacom_tpc_single_touch(wacom, len);
+
+                case WACOM_REPORT_PENABLED:
+                        return wacom_tpc_pen(wacom);
+                }
+        }
 
         return 0;
 }
@@ -1317,7 +1329,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                 break;
 
         case TABLETPC2FG:
-                if (features->device_type == BTN_TOOL_DOUBLETAP) {
+                if (features->device_type == BTN_TOOL_FINGER) {
 
                         input_mt_init_slots(input_dev, 2);
                         input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
@@ -1366,7 +1378,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
 
                 __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
 
-                if (features->device_type == BTN_TOOL_DOUBLETAP) {
+                if (features->device_type == BTN_TOOL_FINGER) {
                         __set_bit(BTN_LEFT, input_dev->keybit);
                         __set_bit(BTN_FORWARD, input_dev->keybit);
                         __set_bit(BTN_BACK, input_dev->keybit);
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 050acaefee7d..4f0ba21b0196 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -39,6 +39,8 @@
 #define WACOM_REPORT_INTUOSPAD          12
 #define WACOM_REPORT_TPC1FG             6
 #define WACOM_REPORT_TPC2FG             13
+#define WACOM_REPORT_TPCHID             15
+#define WACOM_REPORT_TPCST              16
 
 /* device quirks */
 #define WACOM_QUIRK_MULTI_INPUT         0x0001