Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: lpfc: avoid false-positive gcc-8 warning

This is an interesting regression with gcc-8, showing a harmless warning
for correct code:

In file included from include/linux/kernel.h:13:0,
...
from drivers/scsi/lpfc/lpfc_debugfs.c:23:
include/linux/printk.h:301:2: error: 'eq' may be used uninitialized in this function [-Werror=maybe-uninitialized]
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
^~~~~~
In file included from drivers/scsi/lpfc/lpfc_debugfs.c:58:0:
drivers/scsi/lpfc/lpfc_debugfs.h:451:31: note: 'eq' was declared here

I managed to reduce the warning into a small test case for gcc-8 that I
reported in the gcc bugzilla[1].

As a workaround, this changes the logic to move the two assignments of
'eq' out of the conditions and instead make the index conditional. This
works for all configurations I tried and avoids adding a bogus
initialization.

Acked-by: James Smart <james.smart@broadcom.com>
Link: [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81958
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Arnd Bergmann and committed by
Martin K. Petersen
5fe5a6c9 73626173

+3 -3
+3 -3
drivers/scsi/lpfc/lpfc_debugfs.h
··· 478 478 return; 479 479 480 480 for (eqidx = 0; eqidx < phba->io_channel_irqs; eqidx++) { 481 - eq = phba->sli4_hba.hba_eq[eqidx]; 482 - if (cq->assoc_qid == eq->queue_id) 481 + if (cq->assoc_qid == phba->sli4_hba.hba_eq[eqidx]->queue_id) 483 482 break; 484 483 } 485 484 if (eqidx == phba->io_channel_irqs) { 486 485 pr_err("Couldn't find EQ for CQ. Using EQ[0]\n"); 487 486 eqidx = 0; 488 - eq = phba->sli4_hba.hba_eq[0]; 489 487 } 488 + 489 + eq = phba->sli4_hba.hba_eq[eqidx]; 490 490 491 491 if (qtype == DUMP_FCP || qtype == DUMP_NVME) 492 492 pr_err("%s CQ: WQ[Idx:%d|Qid%d]->CQ[Idx%d|Qid%d]"