Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7928f814 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

net: ll_temac: Switch to use dev_err_probe() helper 



[ Upstream commit 75ae8c284c00dc3584b7c173f6fcf96ee15bd02c ]

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: ef45e8400f5b ("net: ll_temac: fix error checking of irq_of_parse_and_map()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 97d8a0bb

drivers/net/ethernet/xilinx/ll_temac_main.c

+6 −10
Original line number Diff line number Diff line
@@ -1481,16 +1481,12 @@ static int temac_probe(struct platform_device *pdev) 
	}



	/* Error handle returned DMA RX and TX interrupts */

	if (lp->rx_irq < 0) {

		if (lp->rx_irq != -EPROBE_DEFER)

			dev_err(&pdev->dev, "could not get DMA RX irq\n");

		return lp->rx_irq;

	}

	if (lp->tx_irq < 0) {

		if (lp->tx_irq != -EPROBE_DEFER)

			dev_err(&pdev->dev, "could not get DMA TX irq\n");

		return lp->tx_irq;

	}

	if (lp->rx_irq < 0)

		return dev_err_probe(&pdev->dev, lp->rx_irq,

				     "could not get DMA RX irq\n");

	if (lp->tx_irq < 0)

		return dev_err_probe(&pdev->dev, lp->tx_irq,

				     "could not get DMA TX irq\n");



	if (temac_np) {

		/* Retrieve the MAC address */