On Sat, 27 Nov 2010, Dmitry Torokhov wrote:
> On Sat, Nov 27, 2010 at 07:07:29PM -0800, Dmitry Torokhov wrote:
> >
> > You need to make sure you are adding entry to
> >
> > drivers/hid/hid-core.c:static const struct hid_device_id hid_blacklist[]
> >
> > and not to
> >
> > drivers/hid/usbhid/hid-quirks.c:static const struct hid_blacklist
> >
> > Hmm, I wonder if we should rename the first one to something different,
> > like hid_has_custom_driver. Jiri?
> >
>
> Something like this one I guess...
>
> --
> Dmitry
>
>
> HID: hid-core - rename hid_blacklist to hid_have_special_driver
>
> From: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
>
> To avoid confusion with hid_blacklist describing various quirks in
> usbhid code, let's rename this one.
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
> ---
>
> 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 b133d47..8b421e6 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -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) },
> @@ -1493,9 +1493,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;
Hi Dmitry,
yes, this thing definitely needed renaming for quite a some time already.
'hid_have_special_driver' sounds more like a boolean type variable to me,
but I wasn't able to come up with anything better after thinking about it
for a few seconds :) so I have applied your version.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
