Commit e1f550dc authored by Chris Packham's avatar Chris Packham Committed by David S. Miller

net: mvmdio: avoid error message for optional IRQ

Per the dt-binding the interrupt is optional so use
platform_get_irq_optional() instead of platform_get_irq(). Since
commit 7723f4c5 ("driver core: platform: Add an error message to
platform_get_irq*()") platform_get_irq() produces an error message

  orion-mdio f1072004.mdio: IRQ index 0 not found

which is perfectly normal if one hasn't specified the optional property
in the device tree.
Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 012fc745
...@@ -347,7 +347,7 @@ static int orion_mdio_probe(struct platform_device *pdev) ...@@ -347,7 +347,7 @@ static int orion_mdio_probe(struct platform_device *pdev)
} }
dev->err_interrupt = platform_get_irq(pdev, 0); dev->err_interrupt = platform_get_irq_optional(pdev, 0);
if (dev->err_interrupt > 0 && if (dev->err_interrupt > 0 &&
resource_size(r) < MVMDIO_ERR_INT_MASK + 4) { resource_size(r) < MVMDIO_ERR_INT_MASK + 4) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
...@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev) ...@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
writel(MVMDIO_ERR_INT_SMI_DONE, writel(MVMDIO_ERR_INT_SMI_DONE,
dev->regs + MVMDIO_ERR_INT_MASK); dev->regs + MVMDIO_ERR_INT_MASK);
} else if (dev->err_interrupt == -EPROBE_DEFER) { } else if (dev->err_interrupt < 0) {
ret = -EPROBE_DEFER; ret = dev->err_interrupt;
goto out_mdio; goto out_mdio;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment