Commit 216e2992 authored by Arun Ramamurthy's avatar Arun Ramamurthy Committed by Kishon Vijay Abraham I
Browse files

usb: ehci-platform: Use devm_of_phy_get_by_index 



Getting phys by index instead of phy names so that we do
not have to create a naming scheme when multiple phys
are present

Signed-off-by: default avatarArun Ramamurthy <arun.ramamurthy@broadcom.com>
Reviewed-by: default avatarRay Jui <rjui@broadcom.com>
Reviewed-by: default avatarScott Branden <sbranden@broadcom.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 6be109b3

drivers/usb/host/ehci-platform.c

+24 −45
Original line number Original line Diff line number Diff line
@@ -88,7 +88,6 @@ static int ehci_platform_power_on(struct platform_device *dev) 
	}

	}





	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

		if (priv->phys[phy_num]) {

		ret = phy_init(priv->phys[phy_num]);

		ret = phy_init(priv->phys[phy_num]);

		if (ret)

		if (ret)

			goto err_exit_phy;

			goto err_exit_phy;
@@ -98,17 +97,14 @@ static int ehci_platform_power_on(struct platform_device *dev) 
			goto err_exit_phy;

			goto err_exit_phy;

		}

		}

	}

	}

	}





	return 0;

	return 0;





err_exit_phy:

err_exit_phy:

	while (--phy_num >= 0) {

	while (--phy_num >= 0) {

		if (priv->phys[phy_num]) {

		phy_power_off(priv->phys[phy_num]);

		phy_power_off(priv->phys[phy_num]);

		phy_exit(priv->phys[phy_num]);

		phy_exit(priv->phys[phy_num]);

	}

	}

	}

err_disable_clks:

err_disable_clks:

	while (--clk >= 0)

	while (--clk >= 0)

		clk_disable_unprepare(priv->clks[clk]);

		clk_disable_unprepare(priv->clks[clk]);
@@ -123,11 +119,9 @@ static void ehci_platform_power_off(struct platform_device *dev) 
	int clk, phy_num;

	int clk, phy_num;





	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

		if (priv->phys[phy_num]) {

		phy_power_off(priv->phys[phy_num]);

		phy_power_off(priv->phys[phy_num]);

		phy_exit(priv->phys[phy_num]);

		phy_exit(priv->phys[phy_num]);

	}

	}

	}





	for (clk = EHCI_MAX_CLKS - 1; clk >= 0; clk--)

	for (clk = EHCI_MAX_CLKS - 1; clk >= 0; clk--)

		if (priv->clks[clk])

		if (priv->clks[clk])
@@ -154,7 +148,6 @@ static int ehci_platform_probe(struct platform_device *dev) 
	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);

	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);

	struct ehci_platform_priv *priv;

	struct ehci_platform_priv *priv;

	struct ehci_hcd *ehci;

	struct ehci_hcd *ehci;

	const char *phy_name;

	int err, irq, phy_num, clk = 0;

	int err, irq, phy_num, clk = 0;





	if (usb_disabled())

	if (usb_disabled())
@@ -204,35 +197,21 @@ static int ehci_platform_probe(struct platform_device *dev) 




		priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,

		priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,

				"phys", "#phy-cells");

				"phys", "#phy-cells");

		priv->num_phys = priv->num_phys > 0 ? priv->num_phys : 1;





		if (priv->num_phys > 0) {

			priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,

			priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,

					    sizeof(struct phy *), GFP_KERNEL);

					    sizeof(struct phy *), GFP_KERNEL);

			if (!priv->phys)

			if (!priv->phys)

				return -ENOMEM;

				return -ENOMEM;



		for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

				err = of_property_read_string_index(

						dev->dev.of_node,

						"phy-names", phy_num,

						&phy_name);



				if (err < 0) {

					if (priv->num_phys > 1) {

						dev_err(&dev->dev, "phy-names not provided");

						goto err_put_hcd;

		} else

		} else

						phy_name = "usb";

			priv->num_phys = 0;

				}





				priv->phys[phy_num] = devm_phy_get(&dev->dev,

		for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

						phy_name);

			priv->phys[phy_num] = devm_of_phy_get_by_index(

					&dev->dev, dev->dev.of_node, phy_num);

			if (IS_ERR(priv->phys[phy_num])) {

			if (IS_ERR(priv->phys[phy_num])) {

				err = PTR_ERR(priv->phys[phy_num]);

				err = PTR_ERR(priv->phys[phy_num]);

					if ((priv->num_phys > 1) ||

					    (err == -EPROBE_DEFER))

					goto err_put_hcd;

					goto err_put_hcd;

					priv->phys[phy_num] = NULL;

			}

			}

		}

		}