Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / phy / phy-core.c

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 8c7f27db6ad352260f8ad8675758ed365b6390a6..a931b1a1dda9525b633faf9f4aec9ef0889b5e0c 100644 (file)
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -500,10 +500,8 @@ struct phy *phy_get(struct device *dev, const char *string)
        int index = 0;
        struct phy *phy;
 
-       if (string == NULL) {
-               dev_WARN(dev, "missing string\n");
+       if (dev_WARN(dev, string == NULL, "missing string\n"))
                return ERR_PTR(-EINVAL);
-       }
 
        if (dev->of_node) {
                index = of_property_match_string(dev->of_node, "phy-names",