From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbbFXIaF (ORCPT ); Wed, 24 Jun 2015 04:30:05 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:57118 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751913AbbFXI3x (ORCPT ); Wed, 24 Jun 2015 04:29:53 -0400 From: Geert Uytterhoeven To: Matthew Wilcox , Hannes Reinecke , "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/2] advansys: Make sure ret and share_irq are initialized Date: Wed, 24 Jun 2015 10:29:49 +0200 Message-Id: <1435134589-16601-2-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435134589-16601-1-git-send-email-geert@linux-m68k.org> References: <1435134589-16601-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/scsi/advansys.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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; } -- 1.9.1