]> git.karo-electronics.de Git - linux-beck.git/commitdiff
scsi: advansys: fix build warning for PCI=n
authorArnd Bergmann <arnd@arndb.de>
Mon, 24 Oct 2016 15:51:55 +0000 (17:51 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2016 22:29:58 +0000 (17:29 -0500)
The advansys probe function tries to handle both ISA and PCI cases, each
hidden in an #ifdef when unused. This leads to a warning indicating that
when PCI is disabled we could be using uninitialized data:

drivers/scsi/advansys.c: In function  advansys_board_found :
drivers/scsi/advansys.c:11036:5: error:  ret  may be used uninitialized in this function [-Werror=maybe-uninitialized]
drivers/scsi/advansys.c:10928:28: note:  ret  was declared here
drivers/scsi/advansys.c:11309:8: error:  share_irq  may be used uninitialized in this function [-Werror=maybe-uninitialized]
drivers/scsi/advansys.c:10928:6: note:  share_irq  was declared here

This cannot happen in practice because the hardware in question only
exists for PCI, but changing the code to just error out here is better
for consistency and avoids the warning.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/advansys.c

index febbd83e2ecd9d6a6984500eb8cc02d6690c3984..81dd0927246b70eecc04ff6860af1f1fc815786d 100644 (file)
@@ -11030,6 +11030,9 @@ static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop,
                ASC_DBG(2, "AdvInitGetConfig()\n");
 
                ret = AdvInitGetConfig(pdev, shost) ? -ENODEV : 0;
+#else
+               share_irq = 0;
+               ret = -ENODEV;
 #endif /* CONFIG_PCI */
        }