aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/musb/musb_core.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index de7b3770f6ee..0f13dedc50a1 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2004,19 +2004,6 @@ bad_config:
2004 musb->irq_wake = 0; 2004 musb->irq_wake = 0;
2005 } 2005 }
2006 2006
2007 pr_info("%s: USB %s mode controller at %p using %s, IRQ %d\n",
2008 musb_driver_name,
2009 ({char *s;
2010 switch (musb->board_mode) {
2011 case MUSB_HOST: s = "Host"; break;
2012 case MUSB_PERIPHERAL: s = "Peripheral"; break;
2013 default: s = "OTG"; break;
2014 }; s; }),
2015 ctrl,
2016 (is_dma_capable() && musb->dma_controller)
2017 ? "DMA" : "PIO",
2018 musb->nIrq);
2019
2020 /* host side needs more setup */ 2007 /* host side needs more setup */
2021 if (is_host_enabled(musb)) { 2008 if (is_host_enabled(musb)) {
2022 struct usb_hcd *hcd = musb_to_hcd(musb); 2009 struct usb_hcd *hcd = musb_to_hcd(musb);
@@ -2079,6 +2066,18 @@ bad_config:
2079 if (status) 2066 if (status)
2080 goto fail2; 2067 goto fail2;
2081 2068
2069 dev_info(dev, "USB %s mode controller at %p using %s, IRQ %d\n",
2070 ({char *s;
2071 switch (musb->board_mode) {
2072 case MUSB_HOST: s = "Host"; break;
2073 case MUSB_PERIPHERAL: s = "Peripheral"; break;
2074 default: s = "OTG"; break;
2075 }; s; }),
2076 ctrl,
2077 (is_dma_capable() && musb->dma_controller)
2078 ? "DMA" : "PIO",
2079 musb->nIrq);
2080
2082 return 0; 2081 return 0;
2083 2082
2084fail2: 2083fail2: