Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Fabio Porcedda and committed by
David S. Miller
d82a7f54 8857ec28

+17 -46
+17 -46
drivers/net/usb/cdc_ether.c
··· 665 665 */ 666 666 { 667 667 /* ZTE (Vodafone) K3805-Z */ 668 - .match_flags = USB_DEVICE_ID_MATCH_VENDOR 669 - | USB_DEVICE_ID_MATCH_PRODUCT 670 - | USB_DEVICE_ID_MATCH_INT_INFO, 671 - .idVendor = ZTE_VENDOR_ID, 672 - .idProduct = 0x1003, 673 - .bInterfaceClass = USB_CLASS_COMM, 674 - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, 675 - .bInterfaceProtocol = USB_CDC_PROTO_NONE, 668 + USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1003, USB_CLASS_COMM, 669 + USB_CDC_SUBCLASS_ETHERNET, 670 + USB_CDC_PROTO_NONE), 676 671 .driver_info = (unsigned long)&wwan_info, 677 672 }, { 678 673 /* ZTE (Vodafone) K3806-Z */ 679 - .match_flags = USB_DEVICE_ID_MATCH_VENDOR 680 - | USB_DEVICE_ID_MATCH_PRODUCT 681 - | USB_DEVICE_ID_MATCH_INT_INFO, 682 - .idVendor = ZTE_VENDOR_ID, 683 - .idProduct = 0x1015, 684 - .bInterfaceClass = USB_CLASS_COMM, 685 - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, 686 - .bInterfaceProtocol = USB_CDC_PROTO_NONE, 674 + USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1015, USB_CLASS_COMM, 675 + USB_CDC_SUBCLASS_ETHERNET, 676 + USB_CDC_PROTO_NONE), 687 677 .driver_info = (unsigned long)&wwan_info, 688 678 }, { 689 679 /* ZTE (Vodafone) K4510-Z */ 690 - .match_flags = USB_DEVICE_ID_MATCH_VENDOR 691 - | USB_DEVICE_ID_MATCH_PRODUCT 692 - | USB_DEVICE_ID_MATCH_INT_INFO, 693 - .idVendor = ZTE_VENDOR_ID, 694 - .idProduct = 0x1173, 695 - .bInterfaceClass = USB_CLASS_COMM, 696 - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, 697 - .bInterfaceProtocol = USB_CDC_PROTO_NONE, 680 + USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1173, USB_CLASS_COMM, 681 + USB_CDC_SUBCLASS_ETHERNET, 682 + USB_CDC_PROTO_NONE), 698 683 .driver_info = (unsigned long)&wwan_info, 699 684 }, { 700 685 /* ZTE (Vodafone) K3770-Z */ 701 - .match_flags = USB_DEVICE_ID_MATCH_VENDOR 702 - | USB_DEVICE_ID_MATCH_PRODUCT 703 - | USB_DEVICE_ID_MATCH_INT_INFO, 704 - .idVendor = ZTE_VENDOR_ID, 705 - .idProduct = 0x1177, 706 - .bInterfaceClass = USB_CLASS_COMM, 707 - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, 708 - .bInterfaceProtocol = USB_CDC_PROTO_NONE, 686 + USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1177, USB_CLASS_COMM, 687 + USB_CDC_SUBCLASS_ETHERNET, 688 + USB_CDC_PROTO_NONE), 709 689 .driver_info = (unsigned long)&wwan_info, 710 690 }, { 711 691 /* ZTE (Vodafone) K3772-Z */ 712 - .match_flags = USB_DEVICE_ID_MATCH_VENDOR 713 - | USB_DEVICE_ID_MATCH_PRODUCT 714 - | USB_DEVICE_ID_MATCH_INT_INFO, 715 - .idVendor = ZTE_VENDOR_ID, 716 - .idProduct = 0x1181, 717 - .bInterfaceClass = USB_CLASS_COMM, 718 - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, 719 - .bInterfaceProtocol = USB_CDC_PROTO_NONE, 692 + USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1181, USB_CLASS_COMM, 693 + USB_CDC_SUBCLASS_ETHERNET, 694 + USB_CDC_PROTO_NONE), 720 695 .driver_info = (unsigned long)&wwan_info, 721 696 }, { 722 697 /* Telit modules */ ··· 709 734 710 735 }, { 711 736 /* Various Huawei modems with a network port like the UMG1831 */ 712 - .match_flags = USB_DEVICE_ID_MATCH_VENDOR 713 - | USB_DEVICE_ID_MATCH_INT_INFO, 714 - .idVendor = HUAWEI_VENDOR_ID, 715 - .bInterfaceClass = USB_CLASS_COMM, 716 - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, 717 - .bInterfaceProtocol = 255, 737 + USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_COMM, 738 + USB_CDC_SUBCLASS_ETHERNET, 255), 718 739 .driver_info = (unsigned long)&wwan_info, 719 740 }, 720 741 { }, /* END */