From: Simon Glass <sjg@chromium.org>
Date: Mon, 9 Nov 2015 06:48:04 +0000 (-0700)
Subject: usb: Avoid open-coded USB constants in usb_kbd.c
X-Git-Tag: v2016.01-rc2~181
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2cdb58ebdc3268a261cd3761b730ca4b98d37985;p=oweals%2Fu-boot.git

usb: Avoid open-coded USB constants in usb_kbd.c

Replace the open-coded values with constants to make it clearer what they
mean.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 1d85212af9..069fbd2de7 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -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 */
 };