diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-02-17 14:29:22 +0530 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-05-15 07:29:20 +0200 |
| commit | 1e7874d2f2a281d3214a0307b1b48ffef5c0f955 (patch) | |
| tree | db3925e40ca64bcf62f83b364efcf351fe6fa7e4 | |
| parent | bb46d90d6cc73d9170f100e92feab0eed604bf1d (diff) | |
| download | linux-3.10-1e7874d2f2a281d3214a0307b1b48ffef5c0f955.tar.gz linux-3.10-1e7874d2f2a281d3214a0307b1b48ffef5c0f955.tar.bz2 linux-3.10-1e7874d2f2a281d3214a0307b1b48ffef5c0f955.zip | |
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>
[backport from upstream commit f40037fd3677ae240978f469cc4155bf3ca7c076]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Iafe801b4c0a2419abc8f20717a3f441a2d9a2ab1
| -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 5f5b0f4be5b..b3555535a8c 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) index = of_property_match_string(dev->of_node, "phy-names", string); phy = of_phy_get(dev, index); - if (IS_ERR(phy)) { - dev_err(dev, "unable to find phy\n"); - return phy; - } } else { 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)) return ERR_PTR(-EPROBE_DEFER); |