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

Commit d82a7f54 authored by Fabio Porcedda's avatar Fabio Porcedda Committed by David S. Miller
Browse files

net: usb: cdc_ether: use usb.h macros whenever possible 



Use USB_DEVICE_AND_INTERFACE_INFO and USB_VENDOR_AND_INTERFACE_INFO
macros to reduce boilerplate.

Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: default avatarOliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8857ec28

drivers/net/usb/cdc_ether.c

+17 −46
Original line number Diff line number Diff line
@@ -665,58 +665,33 @@ static const struct usb_device_id products[] = { 
 */

{

	/* ZTE (Vodafone) K3805-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1003,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1003, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3806-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1015,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1015, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K4510-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1173,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1173, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3770-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1177,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1177, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3772-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1181,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1181, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET,

				      USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* Telit modules */
@@ -734,12 +709,8 @@ static const struct usb_device_id products[] = { 


}, {

	/* Various Huawei modems with a network port like the UMG1831 */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = HUAWEI_VENDOR_ID,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= 255,

	USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_COMM,

				      USB_CDC_SUBCLASS_ETHERNET, 255),

	.driver_info = (unsigned long)&wwan_info,

},

	{ },		/* END */