usb: rename phy to usb_phy in OTG

This patch prepares the introduction of the generic PHY support in the
USB OTG common functions. The USB PHY member of the OTG structure is
renamed to 'usb_phy' and modifications are done in all drivers accessing
it. Renaming this pointer will allow to keep the compatibility for USB
PHY drivers.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 9f4093590f4c..32c3e86b4935 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -60,7 +60,7 @@ EXPORT_SYMBOL_GPL(omap_usb2_set_comparator);
 
 static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled)
 {
-        struct omap_usb *phy = phy_to_omapusb(otg->phy);
+        struct omap_usb *phy = phy_to_omapusb(otg->usb_phy);
 
         if (!phy->comparator)
                 return -ENODEV;
@@ -70,7 +70,7 @@ static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled)
 
 static int omap_usb_start_srp(struct usb_otg *otg)
 {
-        struct omap_usb *phy = phy_to_omapusb(otg->phy);
+        struct omap_usb *phy = phy_to_omapusb(otg->usb_phy);
 
         if (!phy->comparator)
                 return -ENODEV;
@@ -251,7 +251,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
                 otg->set_vbus           = omap_usb_set_vbus;
         if (phy_data->flags & OMAP_USB2_HAS_START_SRP)
                 otg->start_srp          = omap_usb_start_srp;
-        otg->phy                = &phy->phy;
+        otg->usb_phy            = &phy->phy;
 
         platform_set_drvdata(pdev, phy);