aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2012-07-13 05:25:24 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 20:13:39 -0400
commitba5952e0711b14d8d4fe172671f8aa6091ace3ee (patch)
treead3cd8b2c781673f263813c49847a34143e4aee6 /drivers/usb/host
parent72119743651054ceddd4fdf0cce161bdb4cc4aac (diff)
USB: ehci-omap: fix compile failure(v1)
The omap_ehci_init() is introduced in the below commit: commit 1a49e2ac9651df7349867a5cf44e2c83de1046af(EHCI: centralize controller initialization) the local variable of 'pdev' inside omap_ehci_init() is used but not defined, so fix the compiling failure. Signed-off-by: Ming Lei <ming.lei@canonical.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-omap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 6133d93808dc..ec21f4a4a056 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -115,9 +115,8 @@ static void omap_ehci_erratum_i693(struct ehci_hcd *ehci)
115 clk_disable(usbhost_p2_fck); 115 clk_disable(usbhost_p2_fck);
116} 116}
117 117
118static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port) 118static void omap_ehci_soft_phy_reset(struct usb_hcd *hcd, u8 port)
119{ 119{
120 struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);
121 unsigned long timeout = jiffies + msecs_to_jiffies(1000); 120 unsigned long timeout = jiffies + msecs_to_jiffies(1000);
122 unsigned reg = 0; 121 unsigned reg = 0;
123 122
@@ -139,7 +138,8 @@ static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
139 cpu_relax(); 138 cpu_relax();
140 139
141 if (time_after(jiffies, timeout)) { 140 if (time_after(jiffies, timeout)) {
142 dev_dbg(&pdev->dev, "phy reset operation timed out\n"); 141 dev_dbg(hcd->self.controller,
142 "phy reset operation timed out\n");
143 break; 143 break;
144 } 144 }
145 } 145 }
@@ -167,9 +167,9 @@ static int omap_ehci_init(struct usb_hcd *hcd)
167 167
168 /* Soft reset the PHY using PHY reset command over ULPI */ 168 /* Soft reset the PHY using PHY reset command over ULPI */
169 if (pdata->port_mode[0] == OMAP_EHCI_PORT_MODE_PHY) 169 if (pdata->port_mode[0] == OMAP_EHCI_PORT_MODE_PHY)
170 omap_ehci_soft_phy_reset(pdev, 0); 170 omap_ehci_soft_phy_reset(hcd, 0);
171 if (pdata->port_mode[1] == OMAP_EHCI_PORT_MODE_PHY) 171 if (pdata->port_mode[1] == OMAP_EHCI_PORT_MODE_PHY)
172 omap_ehci_soft_phy_reset(pdev, 1); 172 omap_ehci_soft_phy_reset(hcd, 1);
173 173
174 /* we know this is the memory we want, no need to ioremap again */ 174 /* we know this is the memory we want, no need to ioremap again */
175 ehci->caps = hcd->regs; 175 ehci->caps = hcd->regs;