mirror of
https://github.com/S3NEO/android_kernel_samsung_msm8226.git
synced 2024-11-07 03:47:13 +00:00
HID: Allow bus wildcard matching
Most HID drivers do not need to know what bus driver is in use. A generic group driver can drive any hid device, and the device list should not need to be duplicated for each new bus. This patch adds wildcard matching to the HID bus, simplifying device list handling for group drivers. Change-Id: I11f26a31f3e6edb7d345c6def7e9dbfe6df6bad9 Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
parent
6320c98541
commit
2bca687488
3 changed files with 4 additions and 2 deletions
|
@ -1360,7 +1360,7 @@ EXPORT_SYMBOL_GPL(hid_input_report);
|
|||
static bool hid_match_one_id(struct hid_device *hdev,
|
||||
const struct hid_device_id *id)
|
||||
{
|
||||
return id->bus == hdev->bus &&
|
||||
return (id->bus == HID_BUS_ANY || id->bus == hdev->bus) &&
|
||||
(id->group == HID_GROUP_ANY || id->group == hdev->group) &&
|
||||
(id->vendor == HID_ANY_ID || id->vendor == hdev->vendor) &&
|
||||
(id->product == HID_ANY_ID || id->product == hdev->product);
|
||||
|
|
|
@ -139,6 +139,7 @@ struct usb_device_id {
|
|||
#define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
|
||||
|
||||
#define HID_ANY_ID (~0)
|
||||
#define HID_BUS_ANY 0xffff
|
||||
#define HID_GROUP_ANY 0x0000
|
||||
|
||||
struct hid_device_id {
|
||||
|
|
|
@ -343,7 +343,8 @@ static int do_hid_entry(const char *filename,
|
|||
id->vendor = TO_NATIVE(id->vendor);
|
||||
id->product = TO_NATIVE(id->product);
|
||||
|
||||
sprintf(alias, "hid:b%04X", id->bus);
|
||||
sprintf(alias, "hid:");
|
||||
ADD(alias, "b", id->bus != HID_BUS_ANY, id->bus);
|
||||
ADD(alias, "g", id->group != HID_GROUP_ANY, id->group);
|
||||
ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
|
||||
ADD(alias, "p", id->product != HID_ANY_ID, id->product);
|
||||
|
|
Loading…
Reference in a new issue