| Message ID | 20210414135525.3535787-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | phy: Allow a NULL phy name for devm_phy_get() | expand |
On 14-04-21, 08:55, Rob Herring wrote: > 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(). Applied, thanks
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 71cb10826326..3e4971253ec1 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -667,16 +667,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))
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> --- Note that I think the device_link_add later on is now redundant with fw_devlinks. If so, this can be simplified to just calling of_phy_get() for DT case. drivers/phy/phy-core.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)