diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:33 +0000 |
| commit | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (patch) | |
| tree | 5813c89fa9245eb00e617b6dab89ddfe4a029184 /drivers/spi/spi-rspi.c | |
| parent | af42d3466bdc8f39806b26f593604fdc54140bcb (diff) | |
| parent | c5923243eb3208ea63b5ed7905610039c4ca5201 (diff) | |
| download | talos-op-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.tar.gz talos-op-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.zip | |
Merge branch 'spi-5.4' into spi-linus
Diffstat (limited to 'drivers/spi/spi-rspi.c')
| -rw-r--r-- | drivers/spi/spi-rspi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 15f5723d9f95..7222c7689c3c 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -1257,9 +1257,9 @@ static int rspi_probe(struct platform_device *pdev) ctlr->flags = ops->flags; 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) { - ret = platform_get_irq_byname(pdev, "mux"); + ret = platform_get_irq_byname_optional(pdev, "mux"); if (ret < 0) ret = platform_get_irq(pdev, 0); if (ret >= 0) @@ -1270,10 +1270,6 @@ static int rspi_probe(struct platform_device *pdev) if (ret >= 0) 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) { /* Single multiplexed interrupt */ |
