1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index f091576b6449..4e489a8850e5 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;
@@ -80,11 +80,9 @@ static int omap_usb_start_srp(struct usb_otg *otg)
 
 static int omap_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
 {
-        struct usb_phy  *phy = otg->phy;
-
         otg->host = host;
         if (!host)
-                phy->state = OTG_STATE_UNDEFINED;
+                otg->state = OTG_STATE_UNDEFINED;
 
         return 0;
 }
@@ -92,11 +90,9 @@ static int omap_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
 static int omap_usb_set_peripheral(struct usb_otg *otg,
                 struct usb_gadget *gadget)
 {
-        struct usb_phy  *phy = otg->phy;
-
         otg->gadget = gadget;
         if (!gadget)
-                phy->state = OTG_STATE_UNDEFINED;
+                otg->state = OTG_STATE_UNDEFINED;
 
         return 0;
 }
@@ -255,12 +251,12 @@ 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);
         pm_runtime_enable(phy->dev);
 
-        generic_phy = devm_phy_create(phy->dev, NULL, &ops, NULL);
+        generic_phy = devm_phy_create(phy->dev, NULL, &ops);
         if (IS_ERR(generic_phy)) {
                 pm_runtime_disable(phy->dev);
                 return PTR_ERR(generic_phy);