From mboxrd@z Thu Jan 1 00:00:00 1970 From: rogerq@ti.com (Roger Quadros) Date: Thu, 10 Jan 2013 18:51:30 +0200 Subject: [PATCH 10/14] usb: ehci-omap: Remove PHY regulator handling code In-Reply-To: <1357836694-30788-1-git-send-email-rogerq@ti.com> References: <1357836694-30788-1-git-send-email-rogerq@ti.com> Message-ID: <1357836694-30788-11-git-send-email-rogerq@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org PHY regulator handling must be done in the PHY driver Signed-off-by: Roger Quadros --- drivers/usb/host/ehci-omap.c | 31 +------------------------------ 1 files changed, 1 insertions(+), 30 deletions(-) diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 46b28d6..02475c7 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -105,19 +104,6 @@ static int omap_ehci_init(struct usb_hcd *hcd) return rc; } -static void disable_put_regulator( - struct usbhs_omap_platform_data *pdata) -{ - int i; - - for (i = 0 ; i < OMAP3_HS_USB_PORTS ; i++) { - if (pdata->regulator[i]) { - regulator_disable(pdata->regulator[i]); - regulator_put(pdata->regulator[i]); - } - } -} - /* configure so an HC device and id are always provided */ /* always called with process context; sleeping is OK */ @@ -140,7 +126,6 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) int ret = -ENODEV; int irq; int i; - char supply[7]; if (usb_disabled()) return -ENODEV; @@ -203,24 +188,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) platform_set_drvdata(pdev, omap_hcd); - /* get ehci regulator and enable */ for (i = 0 ; i < omap_hcd->nports ; i++) { struct platform_device *phy_pdev; struct usbhs_phy_config *phy_config; - if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) { - pdata->regulator[i] = NULL; + if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) continue; - } - snprintf(supply, sizeof(supply), "hsusb%d", i); - pdata->regulator[i] = regulator_get(dev, supply); - if (IS_ERR(pdata->regulator[i])) { - pdata->regulator[i] = NULL; - dev_dbg(dev, - "failed to get ehci port%d regulator\n", i); - } else { - regulator_enable(pdata->regulator[i]); - } /* instantiate PHY */ if (!pdata->phy_config[i]) { @@ -275,7 +248,6 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) return 0; err_pm_runtime: - disable_put_regulator(pdata); pm_runtime_put_sync(dev); usb_put_hcd(hcd); for (i = 0 ; i < omap_hcd->nports ; i++) { @@ -307,7 +279,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev) int i; usb_remove_hcd(hcd); - disable_put_regulator(dev->platform_data); iounmap(hcd->regs); usb_put_hcd(hcd); -- 1.7.4.1