Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ef2e23f authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Greg Kroah-Hartman
Browse files

USB: Use USB defines in usbmouse.c and usbkbd.c 



The below patch proposes to use USB defines (defined in linux/hid.h)
instead of just plain numbers in the USB_INTERFACE_INFO statements.

Signed-off-by: default avatarMichael Opdenacker <michael@free-electrons.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 672027a3

drivers/usb/input/usbkbd.c

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/usb/input.h>

#include <linux/hid.h>



/*

 * Version Information
@@ -330,7 +331,8 @@ static void usb_kbd_disconnect(struct usb_interface *intf) 
}



static struct usb_device_id usb_kbd_id_table [] = {

	{ USB_INTERFACE_INFO(3, 1, 1) },

	{ USB_INTERFACE_INFO(USB_INTERFACE_CLASS_HID, USB_INTERFACE_SUBCLASS_BOOT,

		USB_INTERFACE_PROTOCOL_KEYBOARD) },

	{ }						/* Terminating entry */

};

drivers/usb/input/usbmouse.c

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/usb/input.h>

#include <linux/hid.h>



/*

 * Version Information
@@ -213,7 +214,8 @@ static void usb_mouse_disconnect(struct usb_interface *intf) 
}



static struct usb_device_id usb_mouse_id_table [] = {

	{ USB_INTERFACE_INFO(3, 1, 2) },

	{ USB_INTERFACE_INFO(USB_INTERFACE_CLASS_HID, USB_INTERFACE_SUBCLASS_BOOT,

		USB_INTERFACE_PROTOCOL_MOUSE) },

	{ }	/* Terminating entry */

};