[PATCH 1/2]linux-usb:Define a new macro for USB storage match rules

[PATCH 1/2]linux-usb:Define a new macro for USB storage match rules

[fangxiaozhi 00110321]

From: fangxiaozhi <huananhu@huawei.com>

1. Define a new macro for USB storage match rules: 
    matching with Vendor ID and interface descriptors.

Signed-off-by: fangxiaozhi <huananhu@huawei.com>
--------------------------------------------------------------------

diff -uprN linux-3.8-rc6_orig/drivers/usb/storage/usb.c linux-3.8-rc6/drivers/usb/storage/usb.c
--- linux-3.8-rc6_orig/drivers/usb/storage/usb.c	2013-02-04 14:38:34.268154216 +0800
+++ linux-3.8-rc6/drivers/usb/storage/usb.c	2013-02-04 14:42:17.103167073 +0800
@@ -120,6 +120,17 @@ MODULE_PARM_DESC(quirks, "supplemental l
 	.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 struct us_unusual_dev us_unusual_dev_list[] = {
 #	include "unusual_devs.h"
 	{ }		/* Terminating entry */
@@ -131,6 +142,7 @@ static struct us_unusual_dev for_dynamic
 #undef UNUSUAL_DEV
 #undef COMPLIANT_DEV
 #undef USUAL_DEV
+#undef UNUSUAL_VENDOR_INTF
 
 #ifdef CONFIG_LOCKDEP
 
diff -uprN linux-3.8-rc6_orig/drivers/usb/storage/usual-tables.c linux-3.8-rc6/drivers/usb/storage/usual-tables.c
--- linux-3.8-rc6_orig/drivers/usb/storage/usual-tables.c	2013-02-04 14:38:34.268154216 +0800
+++ linux-3.8-rc6/drivers/usb/storage/usual-tables.c	2013-02-04 14:49:48.256193103 +0800
@@ -41,6 +41,20 @@
 #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) \
+}
+
 struct usb_device_id usb_storage_usb_ids[] = {
 #	include "unusual_devs.h"
 	{ }		/* Terminating entry */
@@ -50,6 +64,7 @@ MODULE_DEVICE_TABLE(usb, usb_storage_usb
 #undef UNUSUAL_DEV
 #undef COMPLIANT_DEV
 #undef USUAL_DEV
+#undef UNUSUAL_VENDOR_INTF
 
 /*
  * The table of devices to ignore

Re: [PATCH 1/2] USB: storage: Define a new macro for USB storage match rules

[Greg KH]

On Mon, Feb 04, 2013 at 03:14:46PM +0800, fangxiaozhi 00110321 wrote:
> +/* 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) \
> +}

I'm not going to reject this given the number of times it has been
submitted, but can't you use the USB_VENDOR_AND_INTERFACE_INFO() macro
here in this definition?

If so, can you send me an add-on patch that makes that change?

thanks,

greg k-h

RE: [PATCH 1/2] USB: storage: Define a new macro for USB storage match rules

[Fangxiaozhi (Franko)]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1552 bytes --]

Dear  Greg：

	OK，thank you very much.

Best Regards,
Franko Fang

> -----Original Message-----
> From: Greg KH [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, February 05, 2013 2:39 AM
> To: Fangxiaozhi (Franko)
> Cc: linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org; Xueguiying (Zihan);
> Linlei (Lei Lin); Yili (Neil); Wangyuhua (Roger, Credit); Huqiao (C); balbi@ti.com;
> mdharm-usb@one-eyed-alien.net; sebastian@breakpoint.cc
> Subject: Re: [PATCH 1/2] USB: storage: Define a new macro for USB storage
> match rules
> 
> On Mon, Feb 04, 2013 at 03:14:46PM +0800, fangxiaozhi 00110321 wrote:
> > +/* 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) \
> > +}
> 
> I'm not going to reject this given the number of times it has been submitted,
> but can't you use the USB_VENDOR_AND_INTERFACE_INFO() macro here in
> this definition?
> 
> If so, can you send me an add-on patch that makes that change?
> 
> thanks,
> 
> greg k-h
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥