Commit 01bf246a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-dev_err_probe' 



Yang Yingliang says:

====================
net: drivers: Switch to use dev_err_probe() helper

In the probe path, dev_err() can be replace with dev_err_probe()
which will check if error code is -EPROBE_DEFER. It will print
error code in a human readable way and simplify the code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 63b7c2eb 75ae8c28

drivers/net/dsa/lantiq_gswip.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -1989,11 +1989,9 @@ static int gswip_gphy_fw_probe(struct gswip_priv *priv, 
	}

	}





	gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);

	gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);

	if (IS_ERR(gphy_fw->reset)) {

	if (IS_ERR(gphy_fw->reset))

		if (PTR_ERR(gphy_fw->reset) != -EPROBE_DEFER)

		return dev_err_probe(dev, PTR_ERR(gphy_fw->reset),

			dev_err(dev, "Failed to lookup gphy reset\n");

				     "Failed to lookup gphy reset\n");

		return PTR_ERR(gphy_fw->reset);

	}





	return gswip_gphy_fw_load(priv, gphy_fw);

	return gswip_gphy_fw_load(priv, gphy_fw);

}

}

drivers/net/ethernet/ibm/emac/core.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -2979,11 +2979,9 @@ static int emac_init_config(struct emac_instance *dev) 




	/* Read MAC-address */

	/* Read MAC-address */

	err = of_get_ethdev_address(np, dev->ndev);

	err = of_get_ethdev_address(np, dev->ndev);

	if (err) {

	if (err)

		if (err != -EPROBE_DEFER)

		return dev_err_probe(&dev->ofdev->dev, err,

			dev_err(&dev->ofdev->dev, "Can't get valid [local-]mac-address from OF !\n");

				     "Can't get valid [local-]mac-address from OF !\n");

		return err;

	}





	/* IAHT and GAHT filter parameterization */

	/* IAHT and GAHT filter parameterization */

	if (emac_has_feature(dev, EMAC_FTR_EMAC4SYNC)) {

	if (emac_has_feature(dev, EMAC_FTR_EMAC4SYNC)) {

drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -445,9 +445,7 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) 




	ret = data->probe(pdev, plat_dat, &stmmac_res);

	ret = data->probe(pdev, plat_dat, &stmmac_res);

	if (ret < 0) {

	if (ret < 0) {

		if (ret != -EPROBE_DEFER)

		dev_err_probe(&pdev->dev, ret, "failed to probe subdriver\n");

			dev_err(&pdev->dev, "failed to probe subdriver: %d\n",

				ret);





		goto remove_config;

		goto remove_config;

	}

	}

drivers/net/ethernet/ti/am65-cpts.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -943,9 +943,7 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs, 
	cpts->irq = of_irq_get_byname(node, "cpts");

	cpts->irq = of_irq_get_byname(node, "cpts");

	if (cpts->irq <= 0) {

	if (cpts->irq <= 0) {

		ret = cpts->irq ?: -ENXIO;

		ret = cpts->irq ?: -ENXIO;

		if (ret != -EPROBE_DEFER)

		dev_err_probe(dev, ret, "Failed to get IRQ number\n");

			dev_err(dev, "Failed to get IRQ number (err = %d)\n",

				ret);

		return ERR_PTR(ret);

		return ERR_PTR(ret);

	}

	}
@@ -965,8 +963,7 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs, 
	cpts->refclk = devm_get_clk_from_child(dev, node, "cpts");

	cpts->refclk = devm_get_clk_from_child(dev, node, "cpts");

	if (IS_ERR(cpts->refclk)) {

	if (IS_ERR(cpts->refclk)) {

		ret = PTR_ERR(cpts->refclk);

		ret = PTR_ERR(cpts->refclk);

		if (ret != -EPROBE_DEFER)

		dev_err_probe(dev, ret, "Failed to get refclk\n");

			dev_err(dev, "Failed to get refclk %d\n", ret);

		return ERR_PTR(ret);

		return ERR_PTR(ret);

	}

	}

drivers/net/ethernet/ti/cpsw.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1319,8 +1319,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
			 */

			 */

			ret = of_phy_register_fixed_link(slave_node);

			ret = of_phy_register_fixed_link(slave_node);

			if (ret) {

			if (ret) {

				if (ret != -EPROBE_DEFER)

				dev_err_probe(&pdev->dev, ret, "failed to register fixed-link phy\n");

					dev_err(&pdev->dev, "failed to register fixed-link phy: %d\n", ret);

				goto err_node_put;

				goto err_node_put;

			}

			}

			slave_data->phy_node = of_node_get(slave_node);

			slave_data->phy_node = of_node_get(slave_node);