usb: ehci-platform: Use devm_of_phy_get_by_index

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-platform.c

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index d8a75a51d6d4f8b9e2430fd1583cf41817f63e60..145bf19ec283a31716cf5704f92df783a6150029 100644 (file)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -88,15 +88,13 @@ static int ehci_platform_power_on(struct platform_device *dev)
        }
 
        for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-               if (priv->phys[phy_num]) {
-                       ret = phy_init(priv->phys[phy_num]);
-                       if (ret)
-                               goto err_exit_phy;
-                       ret = phy_power_on(priv->phys[phy_num]);
-                       if (ret) {
-                               phy_exit(priv->phys[phy_num]);
-                               goto err_exit_phy;
-                       }
+               ret = phy_init(priv->phys[phy_num]);
+               if (ret)
+                       goto err_exit_phy;
+               ret = phy_power_on(priv->phys[phy_num]);
+               if (ret) {
+                       phy_exit(priv->phys[phy_num]);
+                       goto err_exit_phy;
                }
        }
 
@@ -104,10 +102,8 @@ static int ehci_platform_power_on(struct platform_device *dev)
 
 err_exit_phy:
        while (--phy_num >= 0) {
-               if (priv->phys[phy_num]) {
-                       phy_power_off(priv->phys[phy_num]);
-                       phy_exit(priv->phys[phy_num]);
-               }
+               phy_power_off(priv->phys[phy_num]);
+               phy_exit(priv->phys[phy_num]);
        }
 err_disable_clks:
        while (--clk >= 0)
@@ -123,10 +119,8 @@ static void ehci_platform_power_off(struct platform_device *dev)
        int clk, 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_exit(priv->phys[phy_num]);
-               }
+               phy_power_off(priv->phys[phy_num]);
+               phy_exit(priv->phys[phy_num]);
        }
 
        for (clk = EHCI_MAX_CLKS - 1; clk >= 0; 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 ehci_platform_priv *priv;
        struct ehci_hcd *ehci;
-       const char *phy_name;
        int err, irq, phy_num, clk = 0;
 
        if (usb_disabled())
@@ -204,36 +197,22 @@ static int ehci_platform_probe(struct platform_device *dev)
 
                priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,
                                "phys", "#phy-cells");
-               priv->num_phys = priv->num_phys > 0 ? priv->num_phys : 1;
 
-               priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,
-                               sizeof(struct phy *), GFP_KERNEL);
-               if (!priv->phys)
-                       return -ENOMEM;
+               if (priv->num_phys > 0) {
+                       priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,
+                                           sizeof(struct phy *), GFP_KERNEL);
+                       if (!priv->phys)
+                               return -ENOMEM;
+               } else
+                       priv->num_phys = 0;
 
                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);
-                               if (IS_ERR(priv->phys[phy_num])) {
-                                       err = PTR_ERR(priv->phys[phy_num]);
-                                       if ((priv->num_phys > 1) ||
-                                           (err == -EPROBE_DEFER))
-                                               goto err_put_hcd;
-                                       priv->phys[phy_num] = NULL;
-                               }
+                       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]);
+                                       goto err_put_hcd;
+                       }
                }
 
                for (clk = 0; clk < EHCI_MAX_CLKS; clk++) {