leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phy: Allow a NULL phy name for devm_phy_get()

Browse Source 
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>
This commit is contained in:
Rob Herring
2021-04-14 08:55:25 -05:00
committed by Vinod Koul
parent 520264db3b
commit 8a917813cc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/phy/phy-core.c
View File

@@ -697,16 +697,18 @@ struct phy *phy_get(struct device *dev, const char *string)
struct phy *phy; struct phy *phy;
struct device_link *link; struct device_link *link;
if (dev->of_node) {
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) { if (string == NULL) {
dev_WARN(dev, "missing string\n"); dev_WARN(dev, "missing string\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
if (dev->of_node) {
index = of_property_match_string(dev->of_node, "phy-names",
string);
phy = _of_phy_get(dev->of_node, index);
} else {
phy = phy_find(dev, string); phy = phy_find(dev, string);
} }
if (IS_ERR(phy)) if (IS_ERR(phy))