[2/2] advansys: Make sure ret and share_irq are initialized

Commit Message

Geert Uytterhoeven June 24, 2015, 8:29 a.m. UTC

If CONFIG_PCI=n:

    drivers/scsi/advansys.c: In function ‘advansys_board_found’:
    drivers/scsi/advansys.c:11037: warning: ‘ret’ is used uninitialized in this function
    drivers/scsi/advansys.c:10929: warning: ‘share_irq’ may be used uninitialized in this function

If CONFIG_PCI=n, ret and share_irq are indeed not initialized.
Pre-initialize them to zero, and drop the now superfluous setting of
share_irq to zero.

Note that this is sort-of a false positive, as apparently
ASC_NARROW_BOARD(boardp) can only be false for PCI boards, e.g. if
CONFIG_PCI=y.

Signed-off-by: Geert Uytterhoeven <[e-mail]>
---
 drivers/scsi/advansys.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Patch

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 1c1cd657c380c2e0..a056226d3f35e863 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -10926,7 +10926,7 @@  static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop,
 	struct asc_board *boardp = shost_priv(shost);
 	ASC_DVC_VAR *asc_dvc_varp = NULL;
 	ADV_DVC_VAR *adv_dvc_varp = NULL;
-	int share_irq, warn_code, ret;
+	int share_irq = 0, warn_code, ret = 0;
 
 	pdev = (bus_type == ASC_IS_PCI) ? to_pci_dev(boardp->dev) : NULL;
 
@@ -10987,11 +10987,9 @@  static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop,
 #ifdef CONFIG_ISA
 		case ASC_IS_ISA:
 			shost->unchecked_isa_dma = true;
-			share_irq = 0;
 			break;
 		case ASC_IS_VL:
 			shost->unchecked_isa_dma = false;
-			share_irq = 0;
 			break;
 		case ASC_IS_EISA:
 			shost->unchecked_isa_dma = false;
@@ -11008,7 +11006,6 @@  static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop,
 			shost_printk(KERN_ERR, shost, "unknown adapter type: "
 					"%d\n", asc_dvc_varp->bus_type);
 			shost->unchecked_isa_dma = false;
-			share_irq = 0;
 			break;
 		}