usb: rename phy to usb_phy in HCD

The USB PHY member of the HCD structure is renamed to 'usb_phy' and
modifications are done in all drivers accessing it.
This is in preparation to adding the generic PHY support.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
[Sergei: added missing 'drivers/usb/misc/lvstest.c' file, resolved rejects,
updated changelog.]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 3d46e73dfdb840f460e5b06416965d132570ec33)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
	drivers/usb/misc/lvstest.c

diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 5d1cace..c693905 100644 (file)
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -59,7 +59,7 @@ static int host_start(struct ci_hdrc *ci)
        hcd->has_tt = 1;
 
        hcd->power_budget = ci->platdata->power_budget;
-       hcd->phy = ci->transceiver;
+       hcd->usb_phy = ci->transceiver;
        hcd->tpl_support = ci->platdata->tpl_support;
 
        ehci = hcd_to_ehci(hcd);

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index ef6ec13..65c20ee 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2590,7 +2590,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
        int retval;
        struct usb_device *rhdev;
 
-       if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->phy) {
+       if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->usb_phy) {
                struct usb_phy *phy = usb_get_phy_dev(hcd->self.controller, 0);
 
                if (IS_ERR(phy)) {
@@ -2603,7 +2603,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
                                usb_put_phy(phy);
                                return retval;
                        }
-                       hcd->phy = phy;
+                       hcd->usb_phy = phy;
                        hcd->remove_phy = 1;
                }
        }
@@ -2749,10 +2749,10 @@ err_allocate_root_hub:
 err_register_bus:
        hcd_buffer_destroy(hcd);
 err_remove_phy:
-       if (hcd->remove_phy && hcd->phy) {
-               usb_phy_shutdown(hcd->phy);
-               usb_put_phy(hcd->phy);
-               hcd->phy = NULL;
+       if (hcd->remove_phy && hcd->usb_phy) {
+               usb_phy_shutdown(hcd->usb_phy);
+               usb_put_phy(hcd->usb_phy);
+               hcd->usb_phy = NULL;
        }
        return retval;
 }
@@ -2826,10 +2826,10 @@ void usb_remove_hcd(struct usb_hcd *hcd)
        usb_put_dev(hcd->self.root_hub);
        usb_deregister_bus(&hcd->self);
        hcd_buffer_destroy(hcd);
-       if (hcd->remove_phy && hcd->phy) {
-               usb_phy_shutdown(hcd->phy);
-               usb_put_phy(hcd->phy);
-               hcd->phy = NULL;
+       if (hcd->remove_phy && hcd->usb_phy) {
+               usb_phy_shutdown(hcd->usb_phy);
+               usb_put_phy(hcd->usb_phy);
+               hcd->usb_phy = NULL;
        }
 }
 EXPORT_SYMBOL_GPL(usb_remove_hcd);

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c31ddaa..adcbe18 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -4301,8 +4301,8 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
        if (retval)
                goto fail;
 
-       if (hcd->phy && !hdev->parent)
-               usb_phy_notify_connect(hcd->phy, udev->speed);
+       if (hcd->usb_phy && !hdev->parent)
+               usb_phy_notify_connect(hcd->usb_phy, udev->speed);
 
        /*
         * Some superspeed devices have finished the link training process
@@ -4509,9 +4509,9 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 
        /* Disconnect any existing devices under this port */
        if (udev) {
-               if (hcd->phy && !hdev->parent &&
+               if (hcd->usb_phy && !hdev->parent &&
                                !(portstatus & USB_PORT_STAT_CONNECTION))
-                       usb_phy_notify_disconnect(hcd->phy, udev->speed);
+                       usb_phy_notify_disconnect(hcd->usb_phy, udev->speed);
                usb_disconnect(&port_dev->child);
        }
        clear_bit(port1, hub->change_bits);

diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index cf2734b..4bdcd34 100644 (file)
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -136,15 +136,15 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
        if (pdata->operating_mode == FSL_USB2_DR_OTG) {
                struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
-               hcd->phy = usb_get_phy(USB_PHY_TYPE_USB2);
+               hcd->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
                dev_dbg(&pdev->dev, "hcd=0x%p  ehci=0x%p, phy=0x%p\n",
-                       hcd, ehci, hcd->phy);
+                       hcd, ehci, hcd->usb_phy);
 
-               if (!IS_ERR_OR_NULL(hcd->phy)) {
-                       retval = otg_set_host(hcd->phy->otg,
+               if (!IS_ERR_OR_NULL(hcd->usb_phy)) {
+                       retval = otg_set_host(hcd->usb_phy->otg,
                                              &ehci_to_hcd(ehci)->self);
                        if (retval) {
-                               usb_put_phy(hcd->phy);
+                               usb_put_phy(hcd->usb_phy);
                                goto err2;
                        }
                } else {
@@ -181,9 +181,9 @@ static void usb_hcd_fsl_remove(struct usb_hcd *hcd,
 {
        struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
 
-       if (!IS_ERR_OR_NULL(hcd->phy)) {
-               otg_set_host(hcd->phy->otg, NULL);
-               usb_put_phy(hcd->phy);
+       if (!IS_ERR_OR_NULL(hcd->usb_phy)) {
+               otg_set_host(hcd->usb_phy->otg, NULL);
+               usb_put_phy(hcd->usb_phy);
        }
 
        usb_remove_hcd(hcd);

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 7d6f64c..28a5b48 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -931,7 +931,7 @@ static int ehci_hub_control (
 #ifdef CONFIG_USB_OTG
                        if ((hcd->self.otg_port == (wIndex + 1))
                            && hcd->self.b_hnp_enable) {
-                               otg_start_hnp(hcd->phy->otg);
+                               otg_start_hnp(hcd->usb_phy->otg);
                                break;
                        }
 #endif

diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index f341651..fea9b15 100644 (file)
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -125,7 +125,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
                goto put_hcd;
        }
 
-       hcd->phy = phy;
+       hcd->usb_phy = phy;
        device_init_wakeup(&pdev->dev, 1);
        /*
         * OTG device parent of HCD takes care of putting
@@ -152,7 +152,7 @@ static int ehci_msm_remove(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
        pm_runtime_set_suspended(&pdev->dev);
 
-       otg_set_host(hcd->phy->otg, NULL);
+       otg_set_host(hcd->usb_phy->otg, NULL);
 
        /* FIXME: need to call usb_remove_hcd() here? */
 

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 633dbea..7cc7357 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -158,7 +158,7 @@ static int tegra_ehci_hub_control(
                if (tegra->port_resuming && !(temp & PORT_SUSPEND)) {
                        /* Resume completed, re-enable disconnect detection */
                        tegra->port_resuming = 0;
-                       tegra_usb_phy_postresume(hcd->phy);
+                       tegra_usb_phy_postresume(hcd->usb_phy);
                }
        }
 
@@ -211,7 +211,7 @@ static int tegra_ehci_hub_control(
                        goto done;
 
                /* Disable disconnect detection during port resume */
-               tegra_usb_phy_preresume(hcd->phy);
+               tegra_usb_phy_preresume(hcd->usb_phy);
 
                ehci->reset_done[wIndex-1] = jiffies + msecs_to_jiffies(25);
 
@@ -406,7 +406,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                err = PTR_ERR(u_phy);
                goto cleanup_clk_en;
        }
-       hcd->phy = u_phy;
+       hcd->usb_phy = u_phy;
 
        tegra->needs_double_reset = of_property_read_bool(pdev->dev.of_node,
                "nvidia,needs-double-reset");
@@ -428,7 +428,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
        ehci->caps = hcd->regs + 0x100;
        ehci->has_hostpc = soc_config->has_hostpc;
 
-       err = usb_phy_init(hcd->phy);
+       err = usb_phy_init(hcd->usb_phy);
        if (err) {
                dev_err(&pdev->dev, "Failed to initialize phy\n");
                goto cleanup_clk_en;
@@ -443,7 +443,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
        }
        u_phy->otg->host = hcd_to_bus(hcd);
 
-       err = usb_phy_set_suspend(hcd->phy, 0);
+       err = usb_phy_set_suspend(hcd->usb_phy, 0);
        if (err) {
                dev_err(&pdev->dev, "Failed to power on the phy\n");
                goto cleanup_phy;
@@ -470,7 +470,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 cleanup_otg_set_host:
        otg_set_host(u_phy->otg, NULL);
 cleanup_phy:
-       usb_phy_shutdown(hcd->phy);
+       usb_phy_shutdown(hcd->usb_phy);
 cleanup_clk_en:
        clk_disable_unprepare(tegra->clk);
 cleanup_hcd_create:
@@ -484,9 +484,9 @@ static int tegra_ehci_remove(struct platform_device *pdev)
        struct tegra_ehci_hcd *tegra =
                (struct tegra_ehci_hcd *)hcd_to_ehci(hcd)->priv;
 
-       otg_set_host(hcd->phy->otg, NULL);
+       otg_set_host(hcd->usb_phy->otg, NULL);
 
-       usb_phy_shutdown(hcd->phy);
+       usb_phy_shutdown(hcd->usb_phy);
        usb_remove_hcd(hcd);
        usb_put_hcd(hcd);
 

diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index c923caf..bf8e3e9 100644 (file)
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -180,10 +180,10 @@ static void start_hnp(struct ohci_hcd *ohci)
        unsigned long   flags;
        u32 l;
 
-       otg_start_hnp(hcd->phy->otg);
+       otg_start_hnp(hcd->usb_phy->otg);
 
        local_irq_save(flags);
-       hcd->phy->state = OTG_STATE_A_SUSPEND;
+       hcd->usb_phy->state = OTG_STATE_A_SUSPEND;
        writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]);
        l = omap_readl(OTG_CTRL);
        l &= ~OTG_A_BUSREQ;
@@ -220,14 +220,14 @@ static int ohci_omap_reset(struct usb_hcd *hcd)
 
 #ifdef CONFIG_USB_OTG
        if (need_transceiver) {
-               hcd->phy = usb_get_phy(USB_PHY_TYPE_USB2);
-               if (!IS_ERR_OR_NULL(hcd->phy)) {
-                       int     status = otg_set_host(hcd->phy->otg,
+               hcd->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
+               if (!IS_ERR_OR_NULL(hcd->usb_phy)) {
+                       int     status = otg_set_host(hcd->usb_phy->otg,
                                                &ohci_to_hcd(ohci)->self);
                        dev_dbg(hcd->self.controller, "init %s phy, status %d\n",
-                                       hcd->phy->label, status);
+                                       hcd->usb_phy->label, status);
                        if (status) {
-                               usb_put_phy(hcd->phy);
+                               usb_put_phy(hcd->usb_phy);
                                return status;
                        }
                } else {
@@ -399,9 +399,9 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
        dev_dbg(hcd->self.controller, "stopping USB Controller\n");
        usb_remove_hcd(hcd);
        omap_ohci_clock_power(0);
-       if (!IS_ERR_OR_NULL(hcd->phy)) {
-               (void) otg_set_host(hcd->phy->otg, 0);
-               usb_put_phy(hcd->phy);
+       if (!IS_ERR_OR_NULL(hcd->usb_phy)) {
+               (void) otg_set_host(hcd->usb_phy->otg, 0);
+               usb_put_phy(hcd->usb_phy);
        }
        if (machine_is_omap_osk())
                gpio_free(9);

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index efe8d8a..bf84f3c 100644 (file)
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -106,7 +106,7 @@ struct usb_hcd {
         * OTG and some Host controllers need software interaction with phys;
         * other external phys should be software-transparent
         */
-       struct usb_phy  *phy;
+       struct usb_phy          *usb_phy;
 
        /* Flags that need to be manipulated atomically because they can
         * change while the host controller is running.  Always use