HID: hid-multitouch: Switch to device groups

Switch the driver over to device group handling.  By adding the
HID_GROUP_MULTITOUCH group to hid-core, hid-generic will no longer
match multitouch devices.  By adding the HID_GROUP_MULTITOUCH entry to
the device list, hid-multitouch will match all unknown multitouch
devices, and udev will automatically load the module.

Since HID_QUIRK_MULTITOUCH never gets set, the special quirks handling
can be removed.  Since all HID MT devices have HID_DG_CONTACTID, they
can be removed from the hid_have_special_driver list.

With this patch, the unknown device ids are no longer NULL, so the code
is modified to check for the generic entry instead.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 0 insertions, 11 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 002781c5a616..7b43186b022c 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -638,10 +638,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         map_key_clear(BTN_STYLUS2);
                         break;
 
-                case 0x51: /* ContactID */
-                        device->quirks |= HID_QUIRK_MULTITOUCH;
-                        goto unknown;
-
                 default:  goto unknown;
                 }
                 break;
@@ -1208,13 +1204,6 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
                 }
         }
 
-        if (hid->quirks & HID_QUIRK_MULTITOUCH) {
-                /* generic hid does not know how to handle multitouch devices */
-                if (hidinput)
-                        goto out_cleanup;
-                goto out_unwind;
-        }
-
         if (hidinput && input_register_device(hidinput->input))
                 goto out_cleanup;