usb: Avoid open-coded USB constants in usb_kbd.c
authorSimon Glass <sjg@chromium.org>
Mon, 9 Nov 2015 06:48:04 +0000 (23:48 -0700)
committerSimon Glass <sjg@chromium.org>
Fri, 20 Nov 2015 03:27:52 +0000 (20:27 -0700)
Replace the open-coded values with constants to make it clearer what they
mean.

Signed-off-by: Simon Glass <sjg@chromium.org>
common/usb_kbd.c

index 1d85212af92c378bbeb27c9047d1a8288b423a5a..069fbd2de7d848d7f1b29c19f0be4b2a0fef959d 100644 (file)
@@ -411,13 +411,13 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)
 
        iface = &dev->config.if_desc[ifnum];
 
-       if (iface->desc.bInterfaceClass != 3)
+       if (iface->desc.bInterfaceClass != USB_CLASS_HID)
                return 0;
 
-       if (iface->desc.bInterfaceSubClass != 1)
+       if (iface->desc.bInterfaceSubClass != USB_SUB_HID_BOOT)
                return 0;
 
-       if (iface->desc.bInterfaceProtocol != 1)
+       if (iface->desc.bInterfaceProtocol != USB_PROT_HID_KEYBOARD)
                return 0;
 
        if (iface->desc.bNumEndpoints != 1)
@@ -626,8 +626,8 @@ static const struct usb_device_id kbd_id_table[] = {
                        USB_DEVICE_ID_MATCH_INT_SUBCLASS |
                        USB_DEVICE_ID_MATCH_INT_PROTOCOL,
                .bInterfaceClass = USB_CLASS_HID,
-               .bInterfaceSubClass = 1,
-               .bInterfaceProtocol = 1,
+               .bInterfaceSubClass = USB_SUB_HID_BOOT,
+               .bInterfaceProtocol = USB_PROT_HID_KEYBOARD,
        },
        { }             /* Terminating entry */
 };