On Fri, 13 Jul 2012, Ming Lei wrote:
> 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.
>
> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxxxxx>
> ---
> drivers/usb/host/ehci-omap.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index 6133d93..ec21f4a 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)
> clk_disable(usbhost_p2_fck);
> }
>
> -static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
> +static void omap_ehci_soft_phy_reset(struct usb_hcd *hcd, u8 port)
> {
> - struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);
> unsigned long timeout = jiffies + msecs_to_jiffies(1000);
> unsigned reg = 0;
>
> @@ -139,7 +138,8 @@ static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
> cpu_relax();
>
> if (time_after(jiffies, timeout)) {
> - dev_dbg(&pdev->dev, "phy reset operation timed out\n");
> + dev_dbg(hcd->self.controller,
> + "phy reset operation timed out\n");
> break;
> }
> }
> @@ -167,9 +167,9 @@ static int omap_ehci_init(struct usb_hcd *hcd)
>
> /* Soft reset the PHY using PHY reset command over ULPI */
> if (pdata->port_mode[0] == OMAP_EHCI_PORT_MODE_PHY)
> - omap_ehci_soft_phy_reset(pdev, 0);
> + omap_ehci_soft_phy_reset(hcd, 0);
> if (pdata->port_mode[1] == OMAP_EHCI_PORT_MODE_PHY)
> - omap_ehci_soft_phy_reset(pdev, 1);
> + omap_ehci_soft_phy_reset(hcd, 1);
>
> /* we know this is the memory we want, no need to ioremap again */
> ehci->caps = hcd->regs;
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
