From: Stephen Warren swar...@nvidia.com
ci_pullup()'s !is_on path contains a cut/paste copy of udc_disconnect().
Remove the duplication by simply calling udc_disconnect() instead.
Signed-off-by: Stephen Warren swar...@nvidia.com
---
drivers/usb/gadget/ci_udc.c | 28
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 6dc20c6c954c..5f308563e246 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -697,6 +697,17 @@ int usb_gadget_handle_interrupts(void)
return value;
}
+void udc_disconnect(void)
+{
+ struct ci_udc *udc = (struct ci_udc *)controller.ctrl-hcor;
+ /* disable pullup */
+ stop_activity();
+ writel(USBCMD_FS2, udc-usbcmd);
+ udelay(800);
+ if (controller.driver)
+ controller.driver-disconnect(controller.gadget);
+}
+
static int ci_pullup(struct usb_gadget *gadget, int is_on)
{
struct ci_udc *udc = (struct ci_udc *)controller.ctrl-hcor;
@@ -715,27 +726,12 @@ static int ci_pullup(struct usb_gadget *gadget, int is_on)
/* Turn on the USB connection by enabling the pullup resistor */
writel(USBCMD_ITC(MICRO_8FRAME) | USBCMD_RUN, udc-usbcmd);
} else {
- stop_activity();
- writel(USBCMD_FS2, udc-usbcmd);
- udelay(800);
- if (controller.driver)
- controller.driver-disconnect(gadget);
+ udc_disconnect();
}
return 0;
}
-void udc_disconnect(void)
-{
- struct ci_udc *udc = (struct ci_udc *)controller.ctrl-hcor;
- /* disable pullup */
- stop_activity();
- writel(USBCMD_FS2, udc-usbcmd);
- udelay(800);
- if (controller.driver)
- controller.driver-disconnect(controller.gadget);
-}
-
static int ci_udc_probe(void)
{
struct ept_queue_head *head;
--
1.8.1.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
