aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/westbridge/astoria/gadget/cyasgadget.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/westbridge/astoria/gadget/cyasgadget.c b/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
index 756ff278f66..0b00271cbeb 100644
--- a/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
+++ b/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
@@ -1882,9 +1882,8 @@ static void cyas_ep0_start(
1882 * disconnect is reported. then a host may connect again, or 1882 * disconnect is reported. then a host may connect again, or
1883 * the driver might get unbound. 1883 * the driver might get unbound.
1884 */ 1884 */
1885int usb_gadget_register_driver( 1885int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
1886 struct usb_gadget_driver *driver 1886 int (*bind)(struct usb_gadget *))
1887 )
1888{ 1887{
1889 cyasgadget *dev = cy_as_gadget_controller ; 1888 cyasgadget *dev = cy_as_gadget_controller ;
1890 int retval; 1889 int retval;
@@ -1898,7 +1897,7 @@ int usb_gadget_register_driver(
1898 * "must not be used in normal operation" 1897 * "must not be used in normal operation"
1899 */ 1898 */
1900 if (!driver 1899 if (!driver
1901 || !driver->bind 1900 || !bind
1902 || !driver->unbind 1901 || !driver->unbind
1903 || !driver->setup) 1902 || !driver->setup)
1904 return -EINVAL; 1903 return -EINVAL;
@@ -1919,7 +1918,7 @@ int usb_gadget_register_driver(
1919 cyas_usb_reset(dev) ; /* External usb */ 1918 cyas_usb_reset(dev) ; /* External usb */
1920 cyas_usb_reinit(dev) ; /* Internal */ 1919 cyas_usb_reinit(dev) ; /* Internal */
1921 1920
1922 retval = driver->bind(&dev->gadget); 1921 retval = bind(&dev->gadget);
1923 if (retval) { 1922 if (retval) {
1924 #ifndef WESTBRIDGE_NDEBUG 1923 #ifndef WESTBRIDGE_NDEBUG
1925 cy_as_hal_print_message("%s bind to driver %s --> %d\n", 1924 cy_as_hal_print_message("%s bind to driver %s --> %d\n",
@@ -1938,7 +1937,7 @@ int usb_gadget_register_driver(
1938 1937
1939 return 0; 1938 return 0;
1940} 1939}
1941EXPORT_SYMBOL(usb_gadget_register_driver); 1940EXPORT_SYMBOL(usb_gadget_probe_driver);
1942 1941
1943static void cyasgadget_nuke( 1942static void cyasgadget_nuke(
1944 cyasgadget_ep *an_ep 1943 cyasgadget_ep *an_ep