[Linuxwacom-devel] [PATCH input-wacom 6/6] Remove BTN_TOOL_RUBBER and BTN_TOOL_STYLUS2 from DTH1152 capabilities

[Jason Gerecke]

Fixes: 7d79680f21 ("backport: add support for DTH-1152 on 2.6.30, 2.6.36, 
2.6.38, and 3.7")
Signed-off-by: Ping Cheng <ping.ch...@wacom.com>
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
 2.6.30/wacom_wac.c | 8 +++++---
 2.6.36/wacom_wac.c | 8 +++++---
 2.6.38/wacom_wac.c | 8 +++++---
 3.7/wacom_wac.c    | 8 +++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 6d63780..66c4b66 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2198,14 +2198,16 @@ void wacom_setup_input_capabilities(struct input_dev 
*input_dev,
        case DTUSX:
        case PL:
        case DTU:
-       case DTH1152:
+               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+               __set_bit(BTN_STYLUS2, input_dev->keybit);
                if (features->type == DTUS) {
                        input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
                }
+               /* fall through */
+
+       case DTH1152:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
-               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
                __set_bit(BTN_STYLUS, input_dev->keybit);
-               __set_bit(BTN_STYLUS2, input_dev->keybit);
                break;
 
        case PTU:
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 4f7cede..224b2d5 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1985,14 +1985,16 @@ void wacom_setup_input_capabilities(struct input_dev 
*input_dev,
        case DTUSX:
        case PL:
        case DTU:
-       case DTH1152:
+               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+               __set_bit(BTN_STYLUS2, input_dev->keybit);
                if (features->type == DTUS) {
                        input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
                }
+               /* fall through */
+
+       case DTH1152:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
-               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
                __set_bit(BTN_STYLUS, input_dev->keybit);
-               __set_bit(BTN_STYLUS2, input_dev->keybit);
                break;
 
        case PTU:
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index e3b1190..c95e655 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -2542,14 +2542,16 @@ int wacom_setup_input_capabilities(struct input_dev 
*input_dev,
        case DTUSX:
        case PL:
        case DTU:
-       case DTH1152:
+               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+               __set_bit(BTN_STYLUS2, input_dev->keybit);
                if (features->type == DTUS) {
                        input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
                }
+               /* fall through */
+
+       case DTH1152:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
-               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
                __set_bit(BTN_STYLUS, input_dev->keybit);
-               __set_bit(BTN_STYLUS2, input_dev->keybit);
 
                __set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
                break;
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index 6db702e..8c7e79c 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -2486,14 +2486,16 @@ int wacom_setup_input_capabilities(struct input_dev 
*input_dev,
        case DTUSX:
        case PL:
        case DTU:
-       case DTH1152:
+               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+               __set_bit(BTN_STYLUS2, input_dev->keybit);
                if (features->type == DTUS) {
                        input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
                }
+               /* fall through */
+
+       case DTH1152:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
-               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
                __set_bit(BTN_STYLUS, input_dev->keybit);
-               __set_bit(BTN_STYLUS2, input_dev->keybit);
 
                __set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
                break;
-- 
2.15.1


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel