diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-12 11:43:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:21:25 -0400 |
commit | b0fca50f5a94a268ed02cfddf44448051ed9343f (patch) | |
tree | bc398947bcf6355f05ec33e4fea6a0b1927384ac /drivers/usb/musb | |
parent | e12995ec8f8d99f2a339541fc28998af2d60af0f (diff) |
usb gadget: don't save bind callback in struct usb_gadget_driver
To accomplish this the function to register a gadget driver takes the bind
function as a second argument. To make things clearer rename the function
to resemble platform_driver_probe.
This fixes many section mismatches like
WARNING: drivers/usb/gadget/g_printer.o(.data+0xc): Section mismatch in
reference from the variable printer_driver to the function
.init.text:printer_bind()
The variable printer_driver references
the function __init printer_bind()
All callers are fixed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
[m.nazarewicz@samsung.com: added dbgp]
Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r-- | drivers/usb/musb/musb_gadget.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index d065e23f123e..ecd5f8cffcbf 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
@@ -1699,9 +1699,11 @@ void musb_gadget_cleanup(struct musb *musb) | |||
1699 | * -ENOMEM no memeory to perform the operation | 1699 | * -ENOMEM no memeory to perform the operation |
1700 | * | 1700 | * |
1701 | * @param driver the gadget driver | 1701 | * @param driver the gadget driver |
1702 | * @param bind the driver's bind function | ||
1702 | * @return <0 if error, 0 if everything is fine | 1703 | * @return <0 if error, 0 if everything is fine |
1703 | */ | 1704 | */ |
1704 | int usb_gadget_register_driver(struct usb_gadget_driver *driver) | 1705 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver, |
1706 | int (*bind)(struct usb_gadget *)) | ||
1705 | { | 1707 | { |
1706 | int retval; | 1708 | int retval; |
1707 | unsigned long flags; | 1709 | unsigned long flags; |
@@ -1709,8 +1711,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
1709 | 1711 | ||
1710 | if (!driver | 1712 | if (!driver |
1711 | || driver->speed != USB_SPEED_HIGH | 1713 | || driver->speed != USB_SPEED_HIGH |
1712 | || !driver->bind | 1714 | || !bind || !driver->setup) |
1713 | || !driver->setup) | ||
1714 | return -EINVAL; | 1715 | return -EINVAL; |
1715 | 1716 | ||
1716 | /* driver must be initialized to support peripheral mode */ | 1717 | /* driver must be initialized to support peripheral mode */ |
@@ -1738,7 +1739,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
1738 | spin_unlock_irqrestore(&musb->lock, flags); | 1739 | spin_unlock_irqrestore(&musb->lock, flags); |
1739 | 1740 | ||
1740 | if (retval == 0) { | 1741 | if (retval == 0) { |
1741 | retval = driver->bind(&musb->g); | 1742 | retval = bind(&musb->g); |
1742 | if (retval != 0) { | 1743 | if (retval != 0) { |
1743 | DBG(3, "bind to driver %s failed --> %d\n", | 1744 | DBG(3, "bind to driver %s failed --> %d\n", |
1744 | driver->driver.name, retval); | 1745 | driver->driver.name, retval); |
@@ -1786,7 +1787,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
1786 | 1787 | ||
1787 | return retval; | 1788 | return retval; |
1788 | } | 1789 | } |
1789 | EXPORT_SYMBOL(usb_gadget_register_driver); | 1790 | EXPORT_SYMBOL(usb_gadget_probe_driver); |
1790 | 1791 | ||
1791 | static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver) | 1792 | static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver) |
1792 | { | 1793 | { |