Commit 84dc1a1d authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: aic7xxx: aic79xx_core: Remove a bunch of unused variables 

Fixes the following W=1 kernel build warning(s):

 drivers/scsi/aic7xxx/aic79xx_core.c: In function ‘ahd_dump_sglist’:
 drivers/scsi/aic7xxx/aic79xx_core.c:1738:14: warning: variable ‘len’ set but not used [-Wunused-but-set-variable]
 1738 | uint32_t len;
 | ^~~
 drivers/scsi/aic7xxx/aic79xx_core.c: In function ‘ahd_handle_seqint’:
 drivers/scsi/aic7xxx/aic79xx_core.c:1911:26: warning: variable ‘tinfo’ set but not used [-Wunused-but-set-variable]
 1911 | struct ahd_transinfo *tinfo;
 | ^~~~~
 drivers/scsi/aic7xxx/aic79xx_core.c: In function ‘ahd_handle_transmission_error’:
 drivers/scsi/aic7xxx/aic79xx_core.c:2672:8: warning: variable ‘lqistat2’ set but not used [-Wunused-but-set-variable]
 2672 | u_int lqistat2;
 | ^~~~~~~~
 drivers/scsi/aic7xxx/aic79xx_core.c: In function ‘ahd_update_pending_scbs’:
 drivers/scsi/aic7xxx/aic79xx_core.c:4221:31: warning: variable ‘tinfo’ set but not used [-Wunused-but-set-variable]
 4221 | struct ahd_initiator_tinfo *tinfo;
 | ^~~~~

Link: https://lore.kernel.org/r/20200721164148.2617584-3-lee.jones@linaro.org


Cc: Hannes Reinecke <hare@suse.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7c7ef829

drivers/scsi/aic7xxx/aic79xx_core.c

+3 −10
Original line number Diff line number Diff line
@@ -1735,10 +1735,8 @@ ahd_dump_sglist(struct scb *scb) 
			sg_list = (struct ahd_dma64_seg*)scb->sg_list;

			for (i = 0; i < scb->sg_count; i++) {

				uint64_t addr;

				uint32_t len;



				addr = ahd_le64toh(sg_list[i].addr);

				len = ahd_le32toh(sg_list[i].len);

				printk("sg[%d] - Addr 0x%x%x : Length %d%s\n",

				       i,

				       (uint32_t)((addr >> 32) & 0xFFFFFFFF),
@@ -1908,7 +1906,6 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat) 
			struct	scb *scb;

			struct	ahd_initiator_tinfo *targ_info;

			struct	ahd_tmode_tstate *tstate;

			struct	ahd_transinfo *tinfo;

			u_int	scbid;



			/*
@@ -1941,7 +1938,6 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat) 
							devinfo.our_scsiid,

							devinfo.target,

							&tstate);

			tinfo = &targ_info->curr;

			ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,

				      AHD_TRANS_ACTIVE, /*paused*/TRUE);

			ahd_set_syncrate(ahd, &devinfo, /*period*/0,
@@ -2669,7 +2665,6 @@ ahd_handle_transmission_error(struct ahd_softc *ahd) 
	struct	scb *scb;

	u_int	scbid;

	u_int	lqistat1;

	u_int	lqistat2;

	u_int	msg_out;

	u_int	curphase;

	u_int	lastphase;
@@ -2680,7 +2675,7 @@ ahd_handle_transmission_error(struct ahd_softc *ahd) 
	scb = NULL;

	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);

	lqistat1 = ahd_inb(ahd, LQISTAT1) & ~(LQIPHASE_LQ|LQIPHASE_NLQ);

	lqistat2 = ahd_inb(ahd, LQISTAT2);

	ahd_inb(ahd, LQISTAT2);

	if ((lqistat1 & (LQICRCI_NLQ|LQICRCI_LQ)) == 0

	 && (ahd->bugs & AHD_NLQICRC_DELAYED_BUG) != 0) {

		u_int lqistate;
@@ -4218,12 +4213,10 @@ ahd_update_pending_scbs(struct ahd_softc *ahd) 
	pending_scb_count = 0;

	LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {

		struct ahd_devinfo devinfo;

		struct ahd_initiator_tinfo *tinfo;

		struct ahd_tmode_tstate *tstate;



		ahd_scb_devinfo(ahd, &devinfo, pending_scb);

		tinfo = ahd_fetch_transinfo(ahd, devinfo.channel,

					    devinfo.our_scsiid,

		ahd_fetch_transinfo(ahd, devinfo.channel, devinfo.our_scsiid,

				    devinfo.target, &tstate);

		if ((tstate->auto_negotiate & devinfo.target_mask) == 0

		 && (pending_scb->flags & SCB_AUTO_NEGOTIATE) != 0) {