net: ethoc: Make use of the helper function dev_err_probe()

When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
And using dev_err_probe() can reduce code size, and simplify the code.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index ed1ed48e7483889397ed3892be16606aedfcfa34..0064ebdaf4b483eec9c41f955e4533760ff6772d 100644 (file)
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -707,20 +707,16 @@ static int ethoc_mdio_probe(struct net_device *dev)
        else
                phy = phy_find_first(priv->mdio);
 
-       if (!phy) {
-               dev_err(&dev->dev, "no PHY found\n");
-               return -ENXIO;
-       }
+       if (!phy)
+               return dev_err_probe(&dev->dev, -ENXIO, "no PHY found\n");
 
        priv->old_duplex = -1;
        priv->old_link = -1;
 
        err = phy_connect_direct(dev, phy, ethoc_mdio_poll,
                                 PHY_INTERFACE_MODE_GMII);
-       if (err) {
-               dev_err(&dev->dev, "could not attach to PHY\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&dev->dev, err, "could not attach to PHY\n");
 
        phy_set_max_speed(phy, SPEED_100);