phy-core: phy_get: Leave error logging to the caller

In various cases errors may be expected, ie probe-deferral or a call to
phy_get from a driver where the use of a phy is optional.

Rather then adding all sort of complicated checks for this, and/or adding
special functions like devm_phy_get_optional, simply don't log an error,
and let deciding if get_phy returning an error really should result in a
dev_err up to the caller.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans de Goede 2014-02-17 14:29:22 +05:30 committed by Greg Kroah-Hartman
parent 06c304e889
commit f40037fd36

View File

@ -404,17 +404,11 @@ struct phy *phy_get(struct device *dev, const char *string)
index = of_property_match_string(dev->of_node, "phy-names", index = of_property_match_string(dev->of_node, "phy-names",
string); string);
phy = of_phy_get(dev, index); phy = of_phy_get(dev, index);
if (IS_ERR(phy)) {
dev_err(dev, "unable to find phy\n");
return phy;
}
} else { } else {
phy = phy_lookup(dev, string); phy = phy_lookup(dev, string);
if (IS_ERR(phy)) {
dev_err(dev, "unable to find phy\n");
return phy;
}
} }
if (IS_ERR(phy))
return phy;
if (!try_module_get(phy->ops->owner)) if (!try_module_get(phy->ops->owner))
return ERR_PTR(-EPROBE_DEFER); return ERR_PTR(-EPROBE_DEFER);