Skip to content

Commit 6f38f12

Browse files
arndbbroonie
authored andcommitted
spi: qup: hide warning for uninitialized variable
The added conditionals in this function apparently confused gcc to the point that it no longer sees the code is safe and instead shows a false-positive warning: drivers/spi/spi-qup.c: In function 'spi_qup_transfer_one': drivers/spi/spi-qup.c:507:28: error: 'tx_nents' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/spi/spi-qup.c:464:17: note: 'tx_nents' was declared here drivers/spi/spi-qup.c:505:28: error: 'rx_nents' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/spi/spi-qup.c:464:7: note: 'rx_nents' was declared here This moves the initialization to a place that makes it obvious to the compiler. Fixes: 5884e17 ("spi: qup: allow multiple DMA transactions per spi xfer") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 4d02373 commit 6f38f12

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/spi/spi-qup.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,6 @@ static u32 spi_qup_sgl_get_nents_len(struct scatterlist *sgl, u32 max,
427427
struct scatterlist *sg;
428428
u32 total = 0;
429429

430-
*nents = 0;
431-
432430
for (sg = sgl; sg; sg = sg_next(sg)) {
433431
unsigned int len = sg_dma_len(sg);
434432

@@ -461,7 +459,7 @@ static int spi_qup_do_dma(struct spi_device *spi, struct spi_transfer *xfer,
461459
tx_sgl = xfer->tx_sg.sgl;
462460

463461
do {
464-
u32 rx_nents, tx_nents;
462+
u32 rx_nents = 0, tx_nents = 0;
465463

466464
if (rx_sgl)
467465
qup->n_words = spi_qup_sgl_get_nents_len(rx_sgl,

0 commit comments

Comments
 (0)