Merge branch 'net-mvmdio-avoid-error-message-for-optional-IRQ'

davem330 · davem330 · commit d36963b861c1 · 2020-03-17T20:54:37.000-07:00
Chris Packham says:

====================
net: mvmdio: avoid error message for optional IRQ

I've gone ahead an sent a revert. This is the same as the original v1 except
I've added Andrew's review to the commit message.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
 		writel(MVMDIO_ERR_INT_SMI_DONE,
 			dev->regs + MVMDIO_ERR_INT_MASK);
 
-	} else if (dev->err_interrupt < 0) {
-		ret = dev->err_interrupt;
+	} else if (dev->err_interrupt == -EPROBE_DEFER) {
+		ret = -EPROBE_DEFER;
 		goto out_mdio;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev)`
`364`	`364`	`writel(MVMDIO_ERR_INT_SMI_DONE,`
`365`	`365`	`dev->regs + MVMDIO_ERR_INT_MASK);`
`366`	`366`
`367`		`- } else if (dev->err_interrupt < 0) {`
`368`		`- ret = dev->err_interrupt;`
	`367`	`+ } else if (dev->err_interrupt == -EPROBE_DEFER) {`
	`368`	`+ ret = -EPROBE_DEFER;`
`369`	`369`	`goto out_mdio;`
`370`	`370`	`}`
`371`	`371`