phy: Allow a NULL phy name for devm_phy_get()
authorRob Herring <robh@kernel.org>
Wed, 14 Apr 2021 13:55:25 +0000 (08:55 -0500)
committerVinod Koul <vkoul@kernel.org>
Fri, 14 May 2021 12:18:41 +0000 (17:48 +0530)
For a single PHY, there's no reason to have a phy-names entry in DT.
The DT specific get functions allow for this already, but devm_phy_get()
WARNs in this case. Other subsystems also don't warn in their get
functions. Let's drop the WARN for DT case in devm_phy_get().

Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210414135525.3535787-1-robh@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/phy-core.c

index ccb575b..91e28d6 100644 (file)
@@ -697,16 +697,18 @@ struct phy *phy_get(struct device *dev, const char *string)
        struct phy *phy;
        struct device_link *link;
 
-       if (string == NULL) {
-               dev_WARN(dev, "missing string\n");
-               return ERR_PTR(-EINVAL);
-       }
-
        if (dev->of_node) {
-               index = of_property_match_string(dev->of_node, "phy-names",
-                       string);
+               if (string)
+                       index = of_property_match_string(dev->of_node, "phy-names",
+                               string);
+               else
+                       index = 0;
                phy = _of_phy_get(dev->of_node, index);
        } else {
+               if (string == NULL) {
+                       dev_WARN(dev, "missing string\n");
+                       return ERR_PTR(-EINVAL);
+               }
                phy = phy_find(dev, string);
        }
        if (IS_ERR(phy))