mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

spi: npcm: Fix uninitialized variable warning

Browse source 
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: Olof Johansson <olof@lixom.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Olof Johansson 2018-11-16 19:55:04 -08:00 committed by Mark Brown
parent a1880d3867
commit 1d2319efb6
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/spi/spi-npcm-pspi.c
View file

@ -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);
priv->rx_bytes -= rsize;
if (priv->rx_buf) {
if (rsize == 1)
val = ioread8(priv->base + NPCM_PSPI_DATA);
if (rsize == 2)
val = ioread16(priv->base + NPCM_PSPI_DATA);
if (!priv->rx_buf)
return;
*priv->rx_buf = val;
priv->rx_buf += rsize;
switch (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,