forked from Minki/linux
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: Michael Opdenacker <michael@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
672027a357
commit
4ef2e23f03
@ -31,6 +31,7 @@
|
|||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/usb/input.h>
|
#include <linux/usb/input.h>
|
||||||
|
#include <linux/hid.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Version Information
|
* Version Information
|
||||||
@ -330,7 +331,8 @@ static void usb_kbd_disconnect(struct usb_interface *intf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct usb_device_id usb_kbd_id_table [] = {
|
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 */
|
{ } /* Terminating entry */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/usb/input.h>
|
#include <linux/usb/input.h>
|
||||||
|
#include <linux/hid.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Version Information
|
* Version Information
|
||||||
@ -213,7 +214,8 @@ static void usb_mouse_disconnect(struct usb_interface *intf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct usb_device_id usb_mouse_id_table [] = {
|
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 */
|
{ } /* Terminating entry */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user