Commit c042b85a authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi

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: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent ccb072de
...@@ -269,7 +269,7 @@ struct usbhs_priv { ...@@ -269,7 +269,7 @@ struct usbhs_priv {
*/ */
struct usbhs_fifo_info fifo_info; struct usbhs_fifo_info fifo_info;
struct usb_phy *phy; struct usb_phy *usb_phy;
}; };
/* /*
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
static int usbhs_rcar2_hardware_init(struct platform_device *pdev) static int usbhs_rcar2_hardware_init(struct platform_device *pdev)
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(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); usb_phy = usb_get_phy_dev(&pdev->dev, 0);
if (IS_ERR(phy)) if (IS_ERR(usb_phy))
return PTR_ERR(phy); return PTR_ERR(usb_phy);
priv->phy = phy; priv->usb_phy = usb_phy;
return 0; return 0;
} }
...@@ -34,11 +34,11 @@ static int usbhs_rcar2_hardware_exit(struct platform_device *pdev) ...@@ -34,11 +34,11 @@ static int usbhs_rcar2_hardware_exit(struct platform_device *pdev)
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
if (!priv->phy) if (!priv->usb_phy)
return 0; return 0;
usb_put_phy(priv->phy); usb_put_phy(priv->usb_phy);
priv->phy = NULL; priv->usb_phy = NULL;
return 0; return 0;
} }
...@@ -48,19 +48,19 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev, ...@@ -48,19 +48,19 @@ static int usbhs_rcar2_power_ctrl(struct platform_device *pdev,
{ {
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
if (!priv->phy) if (!priv->usb_phy)
return -ENODEV; return -ENODEV;
if (enable) { if (enable) {
int retval = usb_phy_init(priv->phy); int retval = usb_phy_init(priv->usb_phy);
if (!retval) if (!retval)
retval = usb_phy_set_suspend(priv->phy, 0); retval = usb_phy_set_suspend(priv->usb_phy, 0);
return retval; return retval;
} }
usb_phy_set_suspend(priv->phy, 1); usb_phy_set_suspend(priv->usb_phy, 1);
usb_phy_shutdown(priv->phy); usb_phy_shutdown(priv->usb_phy);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment