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: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Stable-dep-of: ef45e8400f5b ("net: ll_temac: fix error checking of irq_of_parse_and_map()") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
a0e42f4bd4
commit
20fe059c1d
@@ -1550,16 +1550,12 @@ static int temac_probe(struct platform_device *pdev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Error handle returned DMA RX and TX interrupts */
|
/* Error handle returned DMA RX and TX interrupts */
|
||||||
if (lp->rx_irq < 0) {
|
if (lp->rx_irq < 0)
|
||||||
if (lp->rx_irq != -EPROBE_DEFER)
|
return dev_err_probe(&pdev->dev, lp->rx_irq,
|
||||||
dev_err(&pdev->dev, "could not get DMA RX irq\n");
|
"could not get DMA RX irq\n");
|
||||||
return lp->rx_irq;
|
if (lp->tx_irq < 0)
|
||||||
}
|
return dev_err_probe(&pdev->dev, lp->tx_irq,
|
||||||
if (lp->tx_irq < 0) {
|
"could not get DMA TX irq\n");
|
||||||
if (lp->tx_irq != -EPROBE_DEFER)
|
|
||||||
dev_err(&pdev->dev, "could not get DMA TX irq\n");
|
|
||||||
return lp->tx_irq;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (temac_np) {
|
if (temac_np) {
|
||||||
/* Retrieve the MAC address */
|
/* Retrieve the MAC address */
|
||||||
|
Reference in New Issue
Block a user