Commit 9f2feb06 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: usbtouchscreen - remove custom USB_DEVICE_HID_CLASS macro 



There already exists perfectly suitable USB_DEVICE_INTERFACE_CLASS
macro, use it.

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20240712051851.3463657-2-dmitry.torokhov@gmail.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 6797e19d

drivers/input/touchscreen/usbtouchscreen.c

+4 −9
Original line number Diff line number Diff line
@@ -130,18 +130,13 @@ enum { 
	DEVTYPE_ETOUCH,

};



#define USB_DEVICE_HID_CLASS(vend, prod) \

	.match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \

		| USB_DEVICE_ID_MATCH_DEVICE, \

	.idVendor = (vend), \

	.idProduct = (prod), \

	.bInterfaceClass = USB_INTERFACE_CLASS_HID



static const struct usb_device_id usbtouch_devices[] = {

#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX

	/* ignore the HID capable devices, handled by usbhid */

	{USB_DEVICE_HID_CLASS(0x0eef, 0x0001), .driver_info = DEVTYPE_IGNORE},

	{USB_DEVICE_HID_CLASS(0x0eef, 0x0002), .driver_info = DEVTYPE_IGNORE},

	{USB_DEVICE_INTERFACE_CLASS(0x0eef, 0x0001, USB_INTERFACE_CLASS_HID),

		.driver_info = DEVTYPE_IGNORE},

	{USB_DEVICE_INTERFACE_CLASS(0x0eef, 0x0002, USB_INTERFACE_CLASS_HID),

		.driver_info = DEVTYPE_IGNORE},



	/* normal device IDs */

	{USB_DEVICE(0x3823, 0x0001), .driver_info = DEVTYPE_EGALAX},