Commit 5ea42963 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

net: qmi_wwan: compress device_id list using macros 



Take advantage of the matching macros to make the device id
list easier to read and maintain.

Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b469a60

drivers/net/usb/qmi_wwan.c

+4 −21
Original line number Diff line number Diff line
@@ -356,38 +356,21 @@ static const struct driver_info qmi_wwan_shared = { 
static const struct usb_device_id products[] = {

	/* 1. CDC ECM like devices match on the control interface */

	{	/* Huawei E392, E398 and possibly others sharing both device id and more... */

		.match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,

		.idVendor           = HUAWEI_VENDOR_ID,

		.bInterfaceClass    = USB_CLASS_VENDOR_SPEC,

		.bInterfaceSubClass = 1,

		.bInterfaceProtocol = 9, /* CDC Ethernet *control* interface */

		USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 9),

		.driver_info        = (unsigned long)&qmi_wwan_info,

	},

	{	/* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */

		.match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,

		.idVendor           = HUAWEI_VENDOR_ID,

		.bInterfaceClass    = USB_CLASS_VENDOR_SPEC,

		.bInterfaceSubClass = 1,

		.bInterfaceProtocol = 57, /* CDC Ethernet *control* interface */

		USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 57),

		.driver_info        = (unsigned long)&qmi_wwan_info,

	},



	/* 2. Combined interface devices matching on class+protocol */

	{	/* Huawei E392, E398 and possibly others in "Windows mode" */

		.match_flags        = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_INFO,

		.idVendor           = HUAWEI_VENDOR_ID,

		.bInterfaceClass    = USB_CLASS_VENDOR_SPEC,

		.bInterfaceSubClass = 1,

		.bInterfaceProtocol = 17,

		USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 17),

		.driver_info        = (unsigned long)&qmi_wwan_shared,

	},

	{	/* Pantech UML290 */

		.match_flags	    = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,

		.idVendor           = 0x106c,

		.idProduct          = 0x3718,

		.bInterfaceClass    = 0xff,

		.bInterfaceSubClass = 0xf0,

		.bInterfaceProtocol = 0xff,

		USB_DEVICE_AND_INTERFACE_INFO(0x106c, 0x3718, USB_CLASS_VENDOR_SPEC, 0xf0, 0xff),

		.driver_info        = (unsigned long)&qmi_wwan_shared,

	},