Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ba7f18c authored by Harvey Harrison's avatar Harvey Harrison Committed by James Bottomley
Browse files

[SCSI] aic79xx: fix shadowed variables 



OK to just reuse the outer declaration as it is never used again.
drivers/scsi/aic7xxx/aic79xx_pci.c:340:12: warning: symbol 'devconfig' shadows an earlier one
drivers/scsi/aic7xxx/aic79xx_pci.c:299:12: originally declared here

targpcistat is always assigned just before use, remove the inner declaration.
drivers/scsi/aic7xxx/aic79xx_pci.c:486:9: warning: symbol 'targpcistat' shadows an earlier one
drivers/scsi/aic7xxx/aic79xx_pci.c:429:9: originally declared here

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 678e80a3

drivers/scsi/aic7xxx/aic79xx_pci.c

+0 −4
Original line number Diff line number Diff line
@@ -337,8 +337,6 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry) 
	 * 64bit bus (PCI64BIT set in devconfig).

	 */

	if ((ahd->flags & (AHD_39BIT_ADDRESSING|AHD_64BIT_ADDRESSING)) != 0) {

		uint32_t devconfig;



		if (bootverbose)

			printf("%s: Enabling 39Bit Addressing\n",

			       ahd_name(ahd));
@@ -483,8 +481,6 @@ ahd_pci_test_register_access(struct ahd_softc *ahd) 
		goto fail;



	if ((ahd_inb(ahd, INTSTAT) & PCIINT) != 0) {

		u_int targpcistat;



		ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);

		targpcistat = ahd_inb(ahd, TARGPCISTAT);

		if ((targpcistat & STA) != 0)