Re: [RFC PATCH 1/6] usb-storage: remove UNUSUAL_VENDOR_INTF macro

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 10/6/23 19:16, Alan Stern wrote:
On Fri, Oct 06, 2023 at 02:54:40PM +0200, Milan Broz wrote:
This patch removes macro that was used only
by commit that was reverted in
  commit ab4b71644a26d1ab92b987b2fd30e17c25e89f85
  USB: storage: fix Huawei mode switching regression

The standard format for referring to commits in patch descriptions is
like this:

commit ab4b71644a26 ("USB: storage: fix Huawei mode switching regression")

Sure, I just forgot to put it here.

Thanks for review for this usb part!
I'll send a new version with fixed issues and your review line.

Milan


That is, the commit hash is abbreviated to its first 12 hex digits and
is followed by the commit title enclosed in parentheses and quotation
marks.

Apart from that minor issue,

Reviewed-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>

Alan Stern


Signed-off-by: Milan Broz <gmazyland@xxxxxxxxx>
---
  drivers/usb/storage/usb.c          | 12 ------------
  drivers/usb/storage/usual-tables.c | 15 ---------------
  2 files changed, 27 deletions(-)

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 7b36a3334fb3..bb1fbeddc5aa 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -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 diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
index 529512827d8f..b3c3ea04c11c 100644
--- a/drivers/usb/storage/usual-tables.c
+++ b/drivers/usb/storage/usual-tables.c
@@ -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
--
2.42.0





[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux