usb: renesas_usbhs: rename phy to usb_phy in usbhs_priv

To support a generic phy driver in this driver later, this patch
renames "struct usb_phy *phy" to "struct usb_phy *usb_phy".

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index a7996da6a1bd19026be98e9d76e3d348c348ff7a..e0d53c51c260dd0caeb0714b42c80a3c4f789c25 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -269,7 +269,7 @@ struct usbhs_priv {
         */
        struct usbhs_fifo_info fifo_info;
 
-       struct usb_phy *phy;
+       struct usb_phy *usb_phy;
 };
 
 /*

diff --git a/drivers/usb/renesas_usbhs/rcar2.c b/drivers/usb/renesas_usbhs/rcar2.c
index e6b9dcc1c289383c142fbdc4f9913bda957e9c0c..f264cadc12cdfdf8ffc94c00c2ff9651d9ca86ab 100644 (file)
--- a/drivers/usb/renesas_usbhs/rcar2.c
+++ b/drivers/usb/renesas_usbhs/rcar2.c
@@ -20,13 +20,13 @@
 static int usbhs_rcar2_hardware_init(struct platform_device *pdev)
 {
        struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
-       struct usb_phy *phy;
+       struct usb_phy *usb_phy;
 
-       phy = usb_get_phy_dev(&pdev->dev, 0);
-       if (IS_ERR(phy))
-               return PTR_ERR(phy);
+       usb_phy = usb_get_phy_dev(&pdev->dev, 0);
+       if (IS_ERR(usb_phy))
+               return PTR_ERR(usb_phy);
 
-       priv->phy = phy;
+       priv->usb_phy = usb_phy;
        return 0;
 }
 
@@ -34,11 +34,11 @@ static int usbhs_rcar2_hardware_exit(struct platform_device *pdev)
 {
        struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
 
-       if (!priv->phy)
+       if (!priv->usb_phy)
                return 0;
 
-       usb_put_phy(priv->phy);
-       priv->phy = NULL;
+       usb_put_phy(priv->usb_phy);
+       priv->usb_phy = NULL;
 
        return 0;
 }
@@ -48,19 +48,19 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev,
 {
        struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
 
-       if (!priv->phy)
+       if (!priv->usb_phy)
                return -ENODEV;
 
        if (enable) {
-               int retval = usb_phy_init(priv->phy);
+               int retval = usb_phy_init(priv->usb_phy);
 
                if (!retval)
-                       retval = usb_phy_set_suspend(priv->phy, 0);
+                       retval = usb_phy_set_suspend(priv->usb_phy, 0);
                return retval;
        }
 
-       usb_phy_set_suspend(priv->phy, 1);
-       usb_phy_shutdown(priv->phy);
+       usb_phy_set_suspend(priv->usb_phy, 1);
+       usb_phy_shutdown(priv->usb_phy);
        return 0;
 }