Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/renesas_usbhs/common.h

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ struct usbhs_priv { 
	 */

	struct usbhs_fifo_info fifo_info;



	struct usb_phy *phy;

	struct usb_phy *usb_phy;

};



/*

drivers/usb/renesas_usbhs/rcar2.c

+13 −13
Original line number Diff line number Diff line
@@ -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;

}