From: Ivan T. Ivanov Date: Fri, 11 Oct 2013 11:46:09 +0000 (+0300) Subject: ehci-msm: Remove global struct usb_phy variable X-Git-Tag: v3.13-rc1~174^2~81 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4f0da055e4ff3e6ed2e2ad1f9c2334aeb845755;p=platform%2Fkernel%2Flinux-stable.git ehci-msm: Remove global struct usb_phy variable Use struct usb_hcd::phy to hold USB PHY instance. Signed-off-by: Ivan T. Ivanov Acked-by: David Brown Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index 0f717dc..1bc9355 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -42,7 +42,6 @@ static const char hcd_name[] = "ehci-msm"; static struct hc_driver __read_mostly msm_hc_driver; -static struct usb_phy *phy; static int ehci_msm_reset(struct usb_hcd *hcd) { @@ -70,6 +69,7 @@ static int ehci_msm_probe(struct platform_device *pdev) { struct usb_hcd *hcd; struct resource *res; + struct usb_phy *phy; int ret; dev_dbg(&pdev->dev, "ehci_msm proble\n"); @@ -121,6 +121,7 @@ static int ehci_msm_probe(struct platform_device *pdev) goto put_hcd; } + hcd->phy = phy; device_init_wakeup(&pdev->dev, 1); /* * OTG device parent of HCD takes care of putting @@ -147,7 +148,7 @@ static int ehci_msm_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); - otg_set_host(phy->otg, NULL); + otg_set_host(hcd->phy->otg, NULL); /* FIXME: need to call usb_remove_hcd() here? */