Commit 1d2319ef authored by Olof Johansson's avatar Olof Johansson Committed by Mark Brown

spi: npcm: Fix uninitialized variable warning

The compiler has no way to know that rsize 1 or 2 are the only valid
values. Also simplify the code a bit with early return.

The warning was:

drivers/spi/spi-npcm-pspi.c:215:6: warning: 'val' may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a1880d38
...@@ -217,15 +217,23 @@ static void npcm_pspi_recv(struct npcm_pspi *priv) ...@@ -217,15 +217,23 @@ static void npcm_pspi_recv(struct npcm_pspi *priv)
rsize = min(bytes_per_word(priv->bits_per_word), priv->rx_bytes); rsize = min(bytes_per_word(priv->bits_per_word), priv->rx_bytes);
priv->rx_bytes -= rsize; priv->rx_bytes -= rsize;
if (priv->rx_buf) { if (!priv->rx_buf)
if (rsize == 1) return;
val = ioread8(priv->base + NPCM_PSPI_DATA);
if (rsize == 2)
val = ioread16(priv->base + NPCM_PSPI_DATA);
*priv->rx_buf = val; switch (rsize) {
priv->rx_buf += rsize; case 1:
val = ioread8(priv->base + NPCM_PSPI_DATA);
break;
case 2:
val = ioread16(priv->base + NPCM_PSPI_DATA);
break;
default:
WARN_ON_ONCE(1);
return;
} }
*priv->rx_buf = val;
priv->rx_buf += rsize;
} }
static int npcm_pspi_transfer_one(struct spi_master *master, static int npcm_pspi_transfer_one(struct spi_master *master,
......
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