aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb/composite.h
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-10 09:01:55 -0400
committerFelipe Balbi <balbi@ti.com>2012-09-10 09:13:01 -0400
commit03de9bf69c589b71c43aa52b838690cb477903c9 (patch)
treee9e5a492733b1e324a5c3633bc5d6718e4b09c3b /include/linux/usb/composite.h
parent1cf0d264088907038be560ba2dd472d5e432a3dc (diff)
usb: gadget: push iManufacturer into gadgets
This patch pushes the iManufacturer module argument from composite into each gadget. Once the user uses the module paramter, the string is overwritten with the final value. Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/usb/composite.h')
-rw-r--r--include/linux/usb/composite.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 9d068a4be778..86553c8c3e8b 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -401,6 +401,7 @@ struct usb_composite_overwrite {
401 u16 idProduct; 401 u16 idProduct;
402 u16 bcdDevice; 402 u16 bcdDevice;
403 char *serial_number; 403 char *serial_number;
404 char *manufacturer;
404}; 405};
405#define USB_GADGET_COMPOSITE_OPTIONS() \ 406#define USB_GADGET_COMPOSITE_OPTIONS() \
406 static struct usb_composite_overwrite coverwrite; \ 407 static struct usb_composite_overwrite coverwrite; \
@@ -416,7 +417,11 @@ struct usb_composite_overwrite {
416 \ 417 \
417 module_param_named(iSerialNumber, coverwrite.serial_number, charp, \ 418 module_param_named(iSerialNumber, coverwrite.serial_number, charp, \
418 S_IRUGO); \ 419 S_IRUGO); \
419 MODULE_PARM_DESC(iSerialNumber, "SerialNumber string") 420 MODULE_PARM_DESC(iSerialNumber, "SerialNumber string"); \
421 \
422 module_param_named(iManufacturer, coverwrite.manufacturer, charp, \
423 S_IRUGO); \
424 MODULE_PARM_DESC(iManufacturer, "USB Manufacturer string")
420 425
421void usb_composite_overwrite_options(struct usb_composite_dev *cdev, 426void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
422 struct usb_composite_overwrite *covr); 427 struct usb_composite_overwrite *covr);