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

usb-storage: remove UNUSUAL_VENDOR_INTF macro

This patch removes macro that was used only by commit that was reverted
in commit ab4b71644a26 ("USB: storage: fix Huawei mode switching
regression")

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20231016072604.40179-2-gmazyland@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Milan Broz and committed by
Greg Kroah-Hartman
35b62f6f 6add6dd3

-27
-12
drivers/usb/storage/usb.c
··· 110 110 .useTransport = use_transport, \ 111 111 } 112 112 113 - #define UNUSUAL_VENDOR_INTF(idVendor, cl, sc, pr, \ 114 - vendor_name, product_name, use_protocol, use_transport, \ 115 - init_function, Flags) \ 116 - { \ 117 - .vendorName = vendor_name, \ 118 - .productName = product_name, \ 119 - .useProtocol = use_protocol, \ 120 - .useTransport = use_transport, \ 121 - .initFunction = init_function, \ 122 - } 123 - 124 113 static const struct us_unusual_dev us_unusual_dev_list[] = { 125 114 # include "unusual_devs.h" 126 115 { } /* Terminating entry */ ··· 121 132 #undef UNUSUAL_DEV 122 133 #undef COMPLIANT_DEV 123 134 #undef USUAL_DEV 124 - #undef UNUSUAL_VENDOR_INTF 125 135 126 136 #ifdef CONFIG_LOCKDEP 127 137
-15
drivers/usb/storage/usual-tables.c
··· 26 26 #define USUAL_DEV(useProto, useTrans) \ 27 27 { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans) } 28 28 29 - /* Define the device is matched with Vendor ID and interface descriptors */ 30 - #define UNUSUAL_VENDOR_INTF(id_vendor, cl, sc, pr, \ 31 - vendorName, productName, useProtocol, useTransport, \ 32 - initFunction, flags) \ 33 - { \ 34 - .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ 35 - | USB_DEVICE_ID_MATCH_VENDOR, \ 36 - .idVendor = (id_vendor), \ 37 - .bInterfaceClass = (cl), \ 38 - .bInterfaceSubClass = (sc), \ 39 - .bInterfaceProtocol = (pr), \ 40 - .driver_info = (flags) \ 41 - } 42 - 43 29 const struct usb_device_id usb_storage_usb_ids[] = { 44 30 # include "unusual_devs.h" 45 31 { } /* Terminating entry */ ··· 35 49 #undef UNUSUAL_DEV 36 50 #undef COMPLIANT_DEV 37 51 #undef USUAL_DEV 38 - #undef UNUSUAL_VENDOR_INTF 39 52 40 53 /* 41 54 * The table of devices to ignore