|
@@ -101,28 +101,6 @@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
-/**
|
|
|
- * usb_gadget_start - tells usb device controller to start up
|
|
|
- * @gadget: The gadget we want to get started
|
|
|
- * @driver: The driver we want to bind to @gadget
|
|
|
- * @bind: The bind function for @driver
|
|
|
- *
|
|
|
- * This call is issued by the UDC Class driver when it's about
|
|
|
- * to register a gadget driver to the device controller, before
|
|
|
- * calling gadget driver's bind() method.
|
|
|
- *
|
|
|
- * It allows the controller to be powered off until strictly
|
|
|
- * necessary to have it powered on.
|
|
|
- *
|
|
|
- * Returns zero on success, else negative errno.
|
|
|
- */
|
|
|
-static inline int usb_gadget_start(struct usb_gadget *gadget,
|
|
|
- struct usb_gadget_driver *driver,
|
|
|
- int (*bind)(struct usb_gadget *, struct usb_gadget_driver *))
|
|
|
-{
|
|
|
- return gadget->ops->start(driver, bind);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* usb_gadget_udc_start - tells usb device controller to start up
|
|
|
* @gadget: The gadget we want to get started
|
|
@@ -143,24 +121,6 @@ static inline int usb_gadget_udc_start(struct usb_gadget *gadget,
|
|
|
return gadget->ops->udc_start(gadget, driver);
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * usb_gadget_stop - tells usb device controller we don't need it anymore
|
|
|
- * @gadget: The device we want to stop activity
|
|
|
- * @driver: The driver to unbind from @gadget
|
|
|
- *
|
|
|
- * This call is issued by the UDC Class driver after calling
|
|
|
- * gadget driver's unbind() method.
|
|
|
- *
|
|
|
- * The details are implementation specific, but it can go as
|
|
|
- * far as powering off UDC completely and disable its data
|
|
|
- * line pullups.
|
|
|
- */
|
|
|
-static inline void usb_gadget_stop(struct usb_gadget *gadget,
|
|
|
- struct usb_gadget_driver *driver)
|
|
|
-{
|
|
|
- gadget->ops->stop(driver);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* usb_gadget_udc_stop - tells usb device controller we don't need it anymore
|
|
|
* @gadget: The device we want to stop activity
|
|
@@ -246,14 +206,6 @@ err1:
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(usb_add_gadget_udc);
|
|
|
|
|
|
-static int udc_is_newstyle(struct usb_udc *udc)
|
|
|
-{
|
|
|
- if (udc->gadget->ops->udc_start && udc->gadget->ops->udc_stop)
|
|
|
- return 1;
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
static void usb_gadget_remove_driver(struct usb_udc *udc)
|
|
|
{
|
|
|
dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n",
|
|
@@ -261,14 +213,10 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
|
|
|
|
|
|
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
|
|
|
|
|
|
- if (udc_is_newstyle(udc)) {
|
|
|
- usb_gadget_disconnect(udc->gadget);
|
|
|
- udc->driver->disconnect(udc->gadget);
|
|
|
- udc->driver->unbind(udc->gadget);
|
|
|
- usb_gadget_udc_stop(udc->gadget, udc->driver);
|
|
|
- } else {
|
|
|
- usb_gadget_stop(udc->gadget, udc->driver);
|
|
|
- }
|
|
|
+ usb_gadget_disconnect(udc->gadget);
|
|
|
+ udc->driver->disconnect(udc->gadget);
|
|
|
+ udc->driver->unbind(udc->gadget);
|
|
|
+ usb_gadget_udc_stop(udc->gadget, udc->driver);
|
|
|
|
|
|
udc->driver = NULL;
|
|
|
udc->dev.driver = NULL;
|
|
@@ -321,22 +269,15 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri
|
|
|
udc->driver = driver;
|
|
|
udc->dev.driver = &driver->driver;
|
|
|
|
|
|
- if (udc_is_newstyle(udc)) {
|
|
|
- ret = driver->bind(udc->gadget, driver);
|
|
|
- if (ret)
|
|
|
- goto err1;
|
|
|
- ret = usb_gadget_udc_start(udc->gadget, driver);
|
|
|
- if (ret) {
|
|
|
- driver->unbind(udc->gadget);
|
|
|
- goto err1;
|
|
|
- }
|
|
|
- usb_gadget_connect(udc->gadget);
|
|
|
- } else {
|
|
|
-
|
|
|
- ret = usb_gadget_start(udc->gadget, driver, driver->bind);
|
|
|
- if (ret)
|
|
|
- goto err1;
|
|
|
+ ret = driver->bind(udc->gadget, driver);
|
|
|
+ if (ret)
|
|
|
+ goto err1;
|
|
|
+ ret = usb_gadget_udc_start(udc->gadget, driver);
|
|
|
+ if (ret) {
|
|
|
+ driver->unbind(udc->gadget);
|
|
|
+ goto err1;
|
|
|
}
|
|
|
+ usb_gadget_connect(udc->gadget);
|
|
|
|
|
|
kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
|
|
|
return 0;
|
|
@@ -440,13 +381,11 @@ static ssize_t usb_udc_softconn_store(struct device *dev,
|
|
|
struct usb_udc *udc = container_of(dev, struct usb_udc, dev);
|
|
|
|
|
|
if (sysfs_streq(buf, "connect")) {
|
|
|
- if (udc_is_newstyle(udc))
|
|
|
- usb_gadget_udc_start(udc->gadget, udc->driver);
|
|
|
+ usb_gadget_udc_start(udc->gadget, udc->driver);
|
|
|
usb_gadget_connect(udc->gadget);
|
|
|
} else if (sysfs_streq(buf, "disconnect")) {
|
|
|
usb_gadget_disconnect(udc->gadget);
|
|
|
- if (udc_is_newstyle(udc))
|
|
|
- usb_gadget_udc_stop(udc->gadget, udc->driver);
|
|
|
+ usb_gadget_udc_stop(udc->gadget, udc->driver);
|
|
|
} else {
|
|
|
dev_err(dev, "unsupported command '%s'\n", buf);
|
|
|
return -EINVAL;
|