Skip to content

Commit d62069c

Browse files
committed
spi: bcm2835: Remove shared interrupt support
This reverts commit ecfbd3c since Lukas Wunner noticed that we start operating on the hardware before we check to see if this is a spurious interrupt. Reported-by: Lukas Wunner <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 08ba930 commit d62069c

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/spi/spi-bcm2835.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,6 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id)
379379
if (bs->tx_len && cs & BCM2835_SPI_CS_DONE)
380380
bcm2835_wr_fifo_blind(bs, BCM2835_SPI_FIFO_SIZE);
381381

382-
/* check if we got interrupt enabled */
383-
if (!(bcm2835_rd(bs, BCM2835_SPI_CS) & BCM2835_SPI_CS_INTR))
384-
return IRQ_NONE;
385-
386382
/* Read as many bytes as possible from FIFO */
387383
bcm2835_rd_fifo(bs);
388384
/* Write as many bytes as possible to FIFO */
@@ -1348,8 +1344,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
13481344
bcm2835_wr(bs, BCM2835_SPI_CS,
13491345
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
13501346

1351-
err = devm_request_irq(&pdev->dev, bs->irq, bcm2835_spi_interrupt,
1352-
IRQF_SHARED, dev_name(&pdev->dev), ctlr);
1347+
err = devm_request_irq(&pdev->dev, bs->irq, bcm2835_spi_interrupt, 0,
1348+
dev_name(&pdev->dev), ctlr);
13531349
if (err) {
13541350
dev_err(&pdev->dev, "could not request IRQ: %d\n", err);
13551351
goto out_dma_release;

0 commit comments

Comments
 (0)