Unverified Commit 1d734f59 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Mark Brown
Browse files

spi: spi-rspi: Drop redeclaring ret variable in qspi_transfer_in() 



"ret" variable is already declared in qspi_transfer_in() at the
beginning of function, drop redeclaring ret in the if block, fixing
below:

spi-rspi.c: In function ‘qspi_transfer_in’:
spi-rspi.c:838:7: warning: declaration of ‘ret’ shadows a previous local
  838 |   int ret = rspi_dma_transfer(rspi, NULL, &xfer->rx_sg);
      |       ^~~
spi-rspi.c:835:6: note: shadowed declaration is here
  835 |  int ret;

Fixes: db300838 ("spi: rspi: avoid uninitialized variable access")
Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20211118031041.2312-4-prabhakar.mahadev-lad.rj@bp.renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent aadbff4a

drivers/spi/spi-rspi.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int qspi_transfer_in(struct rspi_data *rspi, struct spi_transfer *xfer) 
	int ret;



	if (rspi->ctlr->can_dma && __rspi_can_dma(rspi, xfer)) {

		int ret = rspi_dma_transfer(rspi, NULL, &xfer->rx_sg);

		ret = rspi_dma_transfer(rspi, NULL, &xfer->rx_sg);

		if (ret != -EAGAIN)

			return ret;

	}