Commit 2de860b4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown

spi: rspi: Use platform_get_irq_byname_optional() for optional irqs

As platform_get_irq_byname() now prints an error when the interrupt
does not exist, scary warnings may be printed for optional interrupts:

    renesas_spi e6b10000.spi: IRQ rx not found
    renesas_spi e6b10000.spi: IRQ mux not found

Fix this by calling platform_get_irq_byname_optional() instead.
Remove the no longer needed printing of platform_get_irq errors, as the
remaining calls to platform_get_irq() and platform_get_irq_byname() take
care of that.

Fixes: 7723f4c5 ("driver core: platform: Add an error message to platform_get_irq*()")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20191016143101.28738-1-geert+renesas@glider.beSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 112d6212
...@@ -1257,9 +1257,9 @@ static int rspi_probe(struct platform_device *pdev) ...@@ -1257,9 +1257,9 @@ static int rspi_probe(struct platform_device *pdev)
ctlr->flags = ops->flags; ctlr->flags = ops->flags;
ctlr->dev.of_node = pdev->dev.of_node; ctlr->dev.of_node = pdev->dev.of_node;
ret = platform_get_irq_byname(pdev, "rx"); ret = platform_get_irq_byname_optional(pdev, "rx");
if (ret < 0) { if (ret < 0) {
ret = platform_get_irq_byname(pdev, "mux"); ret = platform_get_irq_byname_optional(pdev, "mux");
if (ret < 0) if (ret < 0)
ret = platform_get_irq(pdev, 0); ret = platform_get_irq(pdev, 0);
if (ret >= 0) if (ret >= 0)
...@@ -1270,10 +1270,6 @@ static int rspi_probe(struct platform_device *pdev) ...@@ -1270,10 +1270,6 @@ static int rspi_probe(struct platform_device *pdev)
if (ret >= 0) if (ret >= 0)
rspi->tx_irq = ret; rspi->tx_irq = ret;
} }
if (ret < 0) {
dev_err(&pdev->dev, "platform_get_irq error\n");
goto error2;
}
if (rspi->rx_irq == rspi->tx_irq) { if (rspi->rx_irq == rspi->tx_irq) {
/* Single multiplexed interrupt */ /* Single multiplexed interrupt */
......
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