* [PATCH v2] HID: uclogic: make input_mapping independent of usb
@ 2015-03-15 18:26 Benjamin Tissoires
2015-03-16 14:48 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Tissoires @ 2015-03-15 18:26 UTC (permalink / raw)
To: Nikolai Kondrashov, Jiri Kosina; +Cc: linux-input, linux-kernel
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>
---
changes in v2:
- renamed ignore_pen_interface in ignore_pen_usage
drivers/hid/hid-uclogic.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
index bdda9fd..9416731 100644
--- 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;
}
--
2.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] HID: uclogic: make input_mapping independent of usb
2015-03-15 18:26 [PATCH v2] HID: uclogic: make input_mapping independent of usb Benjamin Tissoires
@ 2015-03-16 14:48 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2015-03-16 14:48 UTC (permalink / raw)
To: Benjamin Tissoires; +Cc: Nikolai Kondrashov, linux-input, linux-kernel
On Sun, 15 Mar 2015, Benjamin Tissoires wrote:
> 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>
> ---
>
> changes in v2:
> - renamed ignore_pen_interface in ignore_pen_usage
Applied to for-4.1/huion-uclogic-merge.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-16 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-15 18:26 [PATCH v2] HID: uclogic: make input_mapping independent of usb Benjamin Tissoires
2015-03-16 14:48 ` Jiri Kosina
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.