leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ehci-msm: Remove global struct usb_phy variable

Browse Source 
Use struct usb_hcd::phy to hold USB PHY instance.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan T. Ivanov 2013-10-11 14:46:09 +03:00 committed by Greg Kroah-Hartman
parent 2b84f92b81
commit e4f0da055e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/host/ehci-msm.c
View File

@ -42,7 +42,6 @@
static const char hcd_name[] = "ehci-msm"; static const char hcd_name[] = "ehci-msm";
static struct hc_driver __read_mostly msm_hc_driver; static struct hc_driver __read_mostly msm_hc_driver;
static struct usb_phy *phy;
static int ehci_msm_reset(struct usb_hcd *hcd) 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 usb_hcd *hcd;
struct resource *res; struct resource *res;
struct usb_phy *phy;
int ret; int ret;
dev_dbg(&pdev->dev, "ehci_msm proble\n"); dev_dbg(&pdev->dev, "ehci_msm proble\n");
@ -121,6 +121,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
goto put_hcd; goto put_hcd;
} }
hcd->phy = phy;
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
/* /*
* OTG device parent of HCD takes care of putting * 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_disable(&pdev->dev);
pm_runtime_set_suspended(&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? */ /* FIXME: need to call usb_remove_hcd() here? */