From: Paul Walmsley <[EMAIL PROTECTED]>
Rename existing quirks handling code that operates over a static array
to "squirks" (short for static quirks) to differentiate it from the
dynamically-allocated quirks that will be introduced in the
next patch. Add an accessor function specifically for static quirks,
usbhid_exists_squirk().
Signed-off-by: Paul Walmsley <[EMAIL PROTECTED]>
---
drivers/hid/usbhid/hid-quirks.c | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
Index: hid/drivers/hid/usbhid/hid-quirks.c
===================================================================
--- hid.orig/drivers/hid/usbhid/hid-quirks.c
+++ hid/drivers/hid/usbhid/hid-quirks.c
@@ -38,6 +38,8 @@
#include <linux/hid-quirks.h>
#include "usbhid.h"
+static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
const u16 idProduct);
+
#define USB_VENDOR_ID_A4TECH 0x09da
#define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006
@@ -482,7 +484,7 @@ static const struct hid_blacklist {
u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct)
{
u32 quirks = 0;
- int n = 0;
+ const struct hid_blacklist *ble = NULL;
/* Ignore all Wacom devices */
if (idVendor == USB_VENDOR_ID_WACOM)
@@ -493,11 +495,42 @@ u32 usbhid_lookup_quirk(const u16 idVend
idProduct <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)
return 0;
+ ble = usbhid_exists_squirk(idVendor, idProduct);
+ if (ble)
+ quirks = ble->quirks;
+
+ return quirks;
+}
+
+
+/* Static quirk accessor functions */
+
+/**
+ * usbhid_exists_squirk: return any static quirks for a USB HID device
+ * @idVendor: the 16-bit USB vendor ID, in native byteorder
+ * @idProduct: the 16-bit USB product ID, in native byteorder
+ *
+ * Description:
+ * Given a USB vendor ID and product ID, return a pointer to
+ * the hid_blacklist entry associated with that device.
+ *
+ * Returns: pointer if quirk found, or NULL if no quirks found.
+ */
+static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
+ const u16 idProduct)
+{
+ const struct hid_blacklist *ble = NULL;
+ int n = 0;
+
for (; hid_blacklist[n].idVendor; n++)
if (hid_blacklist[n].idVendor == idVendor &&
hid_blacklist[n].idProduct == idProduct)
- quirks = hid_blacklist[n].quirks;
+ ble = &hid_blacklist[n];
- return quirks;
+ if (ble != NULL)
+ dbg("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
+ ble->quirks, ble->idVendor, ble->idProduct);
+
+ return ble;
}
