Skip to content

Commit

Permalink
HID: hid-core - rename hid_blacklist to hid_have_special_driver
Browse files Browse the repository at this point in the history
To avoid confusion with hid_blacklist describing various quirks in
usbhid code, let's rename this one.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Dmitry Torokhov authored and Jiri Kosina committed Nov 28, 2010
1 parent b9e4b1e commit ce06b9d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/hid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@ void hid_disconnect(struct hid_device *hdev)
EXPORT_SYMBOL_GPL(hid_disconnect);

/* a list of devices for which there is a specialized driver on HID bus */
static const struct hid_device_id hid_blacklist[] = {
static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },
{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
Expand Down Expand Up @@ -1503,9 +1503,9 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv)
if (!hid_match_device(hdev, hdrv))
return 0;

/* generic wants all non-blacklisted */
/* generic wants all that don't have specialized driver */
if (!strncmp(hdrv->name, "generic-", 8))
return !hid_match_id(hdev, hid_blacklist);
return !hid_match_id(hdev, hid_have_special_driver);

return 1;
}
Expand Down

0 comments on commit ce06b9d

Please sign in to comment.