HID: uclogic: make input_mapping independent of usb

No need to retrieve the USB handle in input_mapping() when we already
do that in probe. It also allows to use the quirk without having to
add the product ID matching.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
index bdda9fd..9416731 100644 (file)
--- a/drivers/hid/hid-uclogic.c
+++ b/drivers/hid/hid-uclogic.c
@@ -627,6 +627,7 @@ struct uclogic_drvdata {
        __u8 *rdesc;
        unsigned int rsize;
        bool invert_pen_inrange;
+       bool ignore_pen_usage;
 };
 
 static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -719,16 +720,12 @@ static int uclogic_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                struct hid_field *field, struct hid_usage *usage,
                unsigned long **bit, int *max)
 {
-       struct usb_interface *intf;
-
-       if (hdev->product == USB_DEVICE_ID_HUION_TABLET) {
-               intf = to_usb_interface(hdev->dev.parent);
+       struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
 
-               /* discard the unused pen interface */
-               if ((intf->cur_altsetting->desc.bInterfaceNumber != 0) &&
-                   (field->application == HID_DG_PEN))
-                       return -1;
-       }
+       /* discard the unused pen interface */
+       if ((drvdata->ignore_pen_usage) &&
+           (field->application == HID_DG_PEN))
+               return -1;
 
        /* let hid-core decide what to do */
        return 0;
@@ -908,6 +905,8 @@ static int uclogic_probe(struct hid_device *hdev,
                                return rc;
                        }
                        drvdata->invert_pen_inrange = true;
+               } else {
+                       drvdata->ignore_pen_usage = true;
                }
                break;
        }