Commit a72691ee authored by Cai Huoqing's avatar Cai Huoqing Committed by David S. Miller
Browse files

net: enetc: 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: default avatarCai Huoqing <caihuoqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9eda994d

drivers/net/ethernet/freescale/enetc/enetc.c

+2 −4
Original line number Diff line number Diff line
@@ -2610,10 +2610,8 @@ int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv) 


	pcie_flr(pdev);

	err = pci_enable_device_mem(pdev);

	if (err) {

		dev_err(&pdev->dev, "device enable failed\n");

		return err;

	}

	if (err)

		return dev_err_probe(&pdev->dev, err, "device enable failed\n");



	/* set up for high or low dma */

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+4 −8
Original line number Diff line number Diff line
@@ -804,10 +804,8 @@ static int enetc_mdio_probe(struct enetc_pf *pf, struct device_node *np) 
	snprintf(bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev));



	err = of_mdiobus_register(bus, np);

	if (err) {

		dev_err(dev, "cannot register MDIO bus\n");

		return err;

	}

	if (err)

		return dev_err_probe(dev, err, "cannot register MDIO bus\n");



	pf->mdio = bus;
@@ -1216,10 +1214,8 @@ static int enetc_pf_probe(struct pci_dev *pdev, 
			 ERR_PTR(err));



	err = enetc_pci_probe(pdev, KBUILD_MODNAME, sizeof(*pf));

	if (err) {

		dev_err(&pdev->dev, "PCI probing failed\n");

		return err;

	}

	if (err)

		return dev_err_probe(&pdev->dev, err, "PCI probing failed\n");



	si = pci_get_drvdata(pdev);

	if (!si->hw.port || !si->hw.global) {

drivers/net/ethernet/freescale/enetc/enetc_ptp.c

+2 −4
Original line number Diff line number Diff line
@@ -39,10 +39,8 @@ static int enetc_ptp_probe(struct pci_dev *pdev, 
	}



	err = pci_enable_device_mem(pdev);

	if (err) {

		dev_err(&pdev->dev, "device enable failed\n");

		return err;

	}

	if (err)

		return dev_err_probe(&pdev->dev, err, "device enable failed\n");



	/* set up for high or low dma */

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

drivers/net/ethernet/freescale/enetc/enetc_vf.c

+2 −4
Original line number Diff line number Diff line
@@ -143,10 +143,8 @@ static int enetc_vf_probe(struct pci_dev *pdev, 
	int err;



	err = enetc_pci_probe(pdev, KBUILD_MODNAME, 0);

	if (err) {

		dev_err(&pdev->dev, "PCI probing failed\n");

		return err;

	}

	if (err)

		return dev_err_probe(&pdev->dev, err, "PCI probing failed\n");



	si = pci_get_drvdata(pdev);