diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-02-17 03:59:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 15:13:15 -0500 |
commit | f40037fd3677ae240978f469cc4155bf3ca7c076 (patch) | |
tree | aa7cd5fc27b062f4e7b8c06b51e7459b3ef3611e /drivers/phy | |
parent | 06c304e88907cac9b1f5b21727ff268bf1705bb5 (diff) |
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>
Diffstat (limited to 'drivers/phy')
-rw-r--r-- | drivers/phy/phy-core.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 5f5b0f4be5be..b3555535a8c6 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c | |||
@@ -404,17 +404,11 @@ struct phy *phy_get(struct device *dev, const char *string) | |||
404 | index = of_property_match_string(dev->of_node, "phy-names", | 404 | index = of_property_match_string(dev->of_node, "phy-names", |
405 | string); | 405 | string); |
406 | phy = of_phy_get(dev, index); | 406 | phy = of_phy_get(dev, index); |
407 | if (IS_ERR(phy)) { | ||
408 | dev_err(dev, "unable to find phy\n"); | ||
409 | return phy; | ||
410 | } | ||
411 | } else { | 407 | } else { |
412 | phy = phy_lookup(dev, string); | 408 | phy = phy_lookup(dev, string); |
413 | if (IS_ERR(phy)) { | ||
414 | dev_err(dev, "unable to find phy\n"); | ||
415 | return phy; | ||
416 | } | ||
417 | } | 409 | } |
410 | if (IS_ERR(phy)) | ||
411 | return phy; | ||
418 | 412 | ||
419 | if (!try_module_get(phy->ops->owner)) | 413 | if (!try_module_get(phy->ops->owner)) |
420 | return ERR_PTR(-EPROBE_DEFER); | 414 | return ERR_PTR(-EPROBE_DEFER); |