lkml.org 
[lkml]   [2012]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 6/6] hid-multitouch: Remove remnant quirk handling
    Date
    With device groups in place, the temporary HID_QUIRK_MULTITOUCH quirk
    is no longer used and can be removed.

    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    ---
    drivers/hid/hid-core.c | 15 ++-------------
    drivers/hid/hid-input.c | 7 -------
    drivers/hid/hid-multitouch.c | 1 -
    include/linux/hid.h | 1 -
    4 files changed, 2 insertions(+), 22 deletions(-)

    diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
    index 748e871..9ec2557 100644
    --- a/drivers/hid/hid-core.c
    +++ b/drivers/hid/hid-core.c
    @@ -1239,10 +1239,6 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
    if ((connect_mask & HID_CONNECT_HIDINPUT) && !hidinput_connect(hdev,
    connect_mask & HID_CONNECT_HIDINPUT_FORCE))
    hdev->claimed |= HID_CLAIMED_INPUT;
    - if (hdev->quirks & HID_QUIRK_MULTITOUCH) {
    - /* this device should be handled by hid-multitouch, skip it */
    - return -ENODEV;
    - }

    if ((connect_mask & HID_CONNECT_HIDDEV) && hdev->hiddev_connect &&
    !hdev->hiddev_connect(hdev,
    @@ -1627,10 +1623,6 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv)
    struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);
    struct hid_device *hdev = container_of(dev, struct hid_device, dev);

    - if ((hdev->quirks & HID_QUIRK_MULTITOUCH) &&
    - !strncmp(hdrv->name, "hid-multitouch", 14))
    - return 1;
    -
    return hid_match_device(hdev, hdrv) != NULL;
    }

    @@ -1648,11 +1640,8 @@ static int hid_device_probe(struct device *dev)
    if (!hdev->driver) {
    id = hid_match_device(hdev, hdrv);
    if (id == NULL) {
    - if (!((hdev->quirks & HID_QUIRK_MULTITOUCH) &&
    - !strncmp(hdrv->name, "hid-multitouch", 14))) {
    - ret = -ENODEV;
    - goto unlock;
    - }
    + ret = -ENODEV;
    + goto unlock;
    }

    hdev->driver = hdrv;
    diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
    index 62d13ee..7b43186 100644
    --- a/drivers/hid/hid-input.c
    +++ b/drivers/hid/hid-input.c
    @@ -1204,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;

    diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
    index 06153ee..125c1e7 100644
    --- a/drivers/hid/hid-multitouch.c
    +++ b/drivers/hid/hid-multitouch.c
    @@ -654,7 +654,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
    * that emit events over several HID messages.
    */
    hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;
    - hdev->quirks &= ~HID_QUIRK_MULTITOUCH;

    td = kzalloc(sizeof(struct mt_device), GFP_KERNEL);
    if (!td) {
    diff --git a/include/linux/hid.h b/include/linux/hid.h
    index 978b744..51626dd 100644
    --- a/include/linux/hid.h
    +++ b/include/linux/hid.h
    @@ -317,7 +317,6 @@ struct hid_item {
    #define HID_QUIRK_BADPAD 0x00000020
    #define HID_QUIRK_MULTI_INPUT 0x00000040
    #define HID_QUIRK_HIDINPUT_FORCE 0x00000080
    -#define HID_QUIRK_MULTITOUCH 0x00000100
    #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000
    #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
    #define HID_QUIRK_NO_INIT_REPORTS 0x20000000
    --
    1.7.10


    \
     
     \ /
      Last update: 2012-04-22 08:05    [W:0.025 / U:90.876 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site