diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-11-28 10:37:14 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-11-28 10:37:14 -0500 |
commit | ce06b9d6d33fd2ed799b6e825d68fe95077da354 (patch) | |
tree | c74cc78216a57f12f0088114733d53d7d075b8e7 | |
parent | b9e4b1e0cd401e915e3ba97afc152946f78f9f0b (diff) |
HID: hid-core - rename hid_blacklist to hid_have_special_driver
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>
-rw-r--r-- | drivers/hid/hid-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index dc56bd61edb7..396f8c7e0076 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1230,7 +1230,7 @@ void hid_disconnect(struct hid_device *hdev) | |||
1230 | EXPORT_SYMBOL_GPL(hid_disconnect); | 1230 | EXPORT_SYMBOL_GPL(hid_disconnect); |
1231 | 1231 | ||
1232 | /* a list of devices for which there is a specialized driver on HID bus */ | 1232 | /* a list of devices for which there is a specialized driver on HID bus */ |
1233 | static const struct hid_device_id hid_blacklist[] = { | 1233 | static const struct hid_device_id hid_have_special_driver[] = { |
1234 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) }, | 1234 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) }, |
1235 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) }, | 1235 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) }, |
1236 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, | 1236 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, |
@@ -1503,9 +1503,9 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv) | |||
1503 | if (!hid_match_device(hdev, hdrv)) | 1503 | if (!hid_match_device(hdev, hdrv)) |
1504 | return 0; | 1504 | return 0; |
1505 | 1505 | ||
1506 | /* generic wants all non-blacklisted */ | 1506 | /* generic wants all that don't have specialized driver */ |
1507 | if (!strncmp(hdrv->name, "generic-", 8)) | 1507 | if (!strncmp(hdrv->name, "generic-", 8)) |
1508 | return !hid_match_id(hdev, hid_blacklist); | 1508 | return !hid_match_id(hdev, hid_have_special_driver); |
1509 | 1509 | ||
1510 | return 1; | 1510 | return 1; |
1511 | } | 1511 | } |