Commit 35b62f6f authored by Milan Broz's avatar Milan Broz Committed by Greg Kroah-Hartman
Browse files

usb-storage: remove UNUSUAL_VENDOR_INTF macro 



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

Signed-off-by: default avatarMilan Broz <gmazyland@gmail.com>
Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20231016072604.40179-2-gmazyland@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6add6dd3

drivers/usb/storage/usb.c

+0 −12
Original line number Diff line number Diff line
@@ -110,17 +110,6 @@ MODULE_PARM_DESC(quirks, "supplemental list of device IDs and their quirks"); 
	.useTransport = use_transport,	\

}



#define UNUSUAL_VENDOR_INTF(idVendor, cl, sc, pr, \

		vendor_name, product_name, use_protocol, use_transport, \

		init_function, Flags) \

{ \

	.vendorName = vendor_name,	\

	.productName = product_name,	\

	.useProtocol = use_protocol,	\

	.useTransport = use_transport,	\

	.initFunction = init_function,	\

}



static const struct us_unusual_dev us_unusual_dev_list[] = {

#	include "unusual_devs.h"

	{ }		/* Terminating entry */
@@ -132,7 +121,6 @@ static const struct us_unusual_dev for_dynamic_ids = 
#undef UNUSUAL_DEV

#undef COMPLIANT_DEV

#undef USUAL_DEV

#undef UNUSUAL_VENDOR_INTF



#ifdef CONFIG_LOCKDEP

drivers/usb/storage/usual-tables.c

+0 −15
Original line number Diff line number Diff line
@@ -26,20 +26,6 @@ 
#define USUAL_DEV(useProto, useTrans) \

{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans) }



/* Define the device is matched with Vendor ID and interface descriptors */

#define UNUSUAL_VENDOR_INTF(id_vendor, cl, sc, pr, \

			vendorName, productName, useProtocol, useTransport, \

			initFunction, flags) \

{ \

	.match_flags = USB_DEVICE_ID_MATCH_INT_INFO \

				| USB_DEVICE_ID_MATCH_VENDOR, \

	.idVendor    = (id_vendor), \

	.bInterfaceClass = (cl), \

	.bInterfaceSubClass = (sc), \

	.bInterfaceProtocol = (pr), \

	.driver_info = (flags) \

}



const struct usb_device_id usb_storage_usb_ids[] = {

#	include "unusual_devs.h"

	{ }		/* Terminating entry */
@@ -49,7 +35,6 @@ MODULE_DEVICE_TABLE(usb, usb_storage_usb_ids); 
#undef UNUSUAL_DEV

#undef COMPLIANT_DEV

#undef USUAL_DEV

#undef UNUSUAL_VENDOR_INTF



/*

 * The table of devices to ignore