[PATCH 2/3] usb: ehci-platform: Use devm_of_phy_get_by_index
From: Arun Ramamurthy <hidden>
Date: 2015-03-20 21:07:32
Also in:
lkml
Subsystem:
the rest, usb ehci driver, usb subsystem · Maintainers:
Linus Torvalds, Alan Stern, Greg Kroah-Hartman
Getting phys by index instead of phy names so that the dt bindings phy-names remain consistent when multiple phys are present Reviewed-by: Ray Jui <rjui@broadcom.com> Reviewed-by: Scott Branden <sbranden@broadcom.com> Signed-off-by: Arun Ramamurthy <redacted> --- drivers/usb/host/ehci-platform.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index d8a75a5..8b0c7ae 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c@@ -154,7 +154,6 @@ static int ehci_platform_probe(struct platform_device *dev) struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev); struct ehci_platform_priv *priv; struct ehci_hcd *ehci; - const char *phy_name; int err, irq, phy_num, clk = 0; if (usb_disabled())
@@ -212,21 +211,10 @@ static int ehci_platform_probe(struct platform_device *dev) 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 - phy_name = "usb"; - } - - priv->phys[phy_num] = devm_phy_get(&dev->dev, - 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])) { err = PTR_ERR(priv->phys[phy_num]); if ((priv->num_phys > 1) ||
--
2.3.2