Commit 12fb61a9 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Mark Brown

spi: spi-fsl-dspi: Reduce indentation level in dspi_interrupt

If the entire function depends on the SPI status register having the
interrupt bits asserted, then just check it and exit early if those bits
aren't set (such as in the case of the shared IRQ being triggered for
the other peripheral). Cosmetic patch.
Signed-off-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/20190822211514.19288-2-olteanv@gmail.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 79522766
...@@ -658,47 +658,48 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id) ...@@ -658,47 +658,48 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id)
regmap_read(dspi->regmap, SPI_SR, &spi_sr); regmap_read(dspi->regmap, SPI_SR, &spi_sr);
regmap_write(dspi->regmap, SPI_SR, spi_sr); regmap_write(dspi->regmap, SPI_SR, spi_sr);
if (!(spi_sr & (SPI_SR_EOQF | SPI_SR_TCFQF)))
return IRQ_HANDLED;
/* Get transfer counter (in number of SPI transfers). It was
* reset to 0 when transfer(s) were started.
*/
regmap_read(dspi->regmap, SPI_TCR, &spi_tcr);
spi_tcnt = SPI_TCR_GET_TCNT(spi_tcr);
/* Update total number of bytes that were transferred */
msg->actual_length += spi_tcnt * dspi->bytes_per_word;
trans_mode = dspi->devtype_data->trans_mode;
switch (trans_mode) {
case DSPI_EOQ_MODE:
dspi_eoq_read(dspi);
break;
case DSPI_TCFQ_MODE:
dspi_tcfq_read(dspi);
break;
default:
dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n",
trans_mode);
return IRQ_HANDLED;
}
if (spi_sr & (SPI_SR_EOQF | SPI_SR_TCFQF)) { if (!dspi->len) {
/* Get transfer counter (in number of SPI transfers). It was dspi->waitflags = 1;
* reset to 0 when transfer(s) were started. wake_up_interruptible(&dspi->waitq);
*/ return IRQ_HANDLED;
regmap_read(dspi->regmap, SPI_TCR, &spi_tcr); }
spi_tcnt = SPI_TCR_GET_TCNT(spi_tcr);
/* Update total number of bytes that were transferred */
msg->actual_length += spi_tcnt * dspi->bytes_per_word;
trans_mode = dspi->devtype_data->trans_mode;
switch (trans_mode) {
case DSPI_EOQ_MODE:
dspi_eoq_read(dspi);
break;
case DSPI_TCFQ_MODE:
dspi_tcfq_read(dspi);
break;
default:
dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n",
trans_mode);
return IRQ_HANDLED;
}
if (!dspi->len) { switch (trans_mode) {
dspi->waitflags = 1; case DSPI_EOQ_MODE:
wake_up_interruptible(&dspi->waitq); dspi_eoq_write(dspi);
} else { break;
switch (trans_mode) { case DSPI_TCFQ_MODE:
case DSPI_EOQ_MODE: dspi_tcfq_write(dspi);
dspi_eoq_write(dspi); break;
break; default:
case DSPI_TCFQ_MODE: dev_err(&dspi->pdev->dev,
dspi_tcfq_write(dspi); "unsupported trans_mode %u\n",
break; trans_mode);
default:
dev_err(&dspi->pdev->dev,
"unsupported trans_mode %u\n",
trans_mode);
}
}
} }
return IRQ_HANDLED; return IRQ_HANDLED;
......
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