diff options
author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
commit | ca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch) | |
tree | f870402f36377f3bde4b939da23dda18bc9bc862 /drivers/spi/spi-npcm-pspi.c | |
parent | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (diff) | |
parent | ffa119f7c42d29be2dd759bb18cc4d1f45804c6b (diff) |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spi-npcm-pspi.c')
-rw-r--r-- | drivers/spi/spi-npcm-pspi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c index b191d57d1dc0..fe624731c74c 100644 --- a/drivers/spi/spi-npcm-pspi.c +++ b/drivers/spi/spi-npcm-pspi.c @@ -293,7 +293,6 @@ static void npcm_pspi_reset_hw(struct npcm_pspi *priv) static irqreturn_t npcm_pspi_handler(int irq, void *dev_id) { struct npcm_pspi *priv = dev_id; - u16 val; u8 stat; stat = ioread8(priv->base + NPCM_PSPI_STAT); @@ -303,7 +302,7 @@ static irqreturn_t npcm_pspi_handler(int irq, void *dev_id) if (priv->tx_buf) { if (stat & NPCM_PSPI_STAT_RBF) { - val = ioread8(NPCM_PSPI_DATA + priv->base); + ioread8(NPCM_PSPI_DATA + priv->base); if (priv->tx_bytes == 0) { npcm_pspi_disable(priv); complete(&priv->xfer_done); |