Commit 90ab1123 authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: advansys: Relocate or remove unused variables 

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

 drivers/scsi/advansys.c: In function ‘asc_prt_asc_board_eeprom’:
 drivers/scsi/advansys.c:2879:15: warning: variable ‘asc_dvc_varp’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/advansys.c: In function ‘asc_prt_driver_conf’:
 drivers/scsi/advansys.c:3174:6: warning: variable ‘chip_scsi_id’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/advansys.c: In function ‘AdvISR’:
 drivers/scsi/advansys.c:6114:9: warning: variable ‘target_bit’ set but not used [-Wunused-but-set-variable]

Link: https://lore.kernel.org/r/20201102142359.561122-17-lee.jones@linaro.org


Cc: Matthew Wilcox <willy@infradead.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 bf7e38aa

drivers/scsi/advansys.c

+3 −13
Original line number Diff line number Diff line
@@ -2876,15 +2876,15 @@ static int asc_get_eeprom_string(ushort *serialnum, uchar *cp) 
static void asc_prt_asc_board_eeprom(struct seq_file *m, struct Scsi_Host *shost)

{

	struct asc_board *boardp = shost_priv(shost);

	ASC_DVC_VAR *asc_dvc_varp;

	ASCEEP_CONFIG *ep;

	int i;

	uchar serialstr[13];

#ifdef CONFIG_ISA

	ASC_DVC_VAR *asc_dvc_varp;

	int isa_dma_speed[] = { 10, 8, 7, 6, 5, 4, 3, 2 };

#endif /* CONFIG_ISA */

	uchar serialstr[13];



	asc_dvc_varp = &boardp->dvc_var.asc_dvc_var;

#endif /* CONFIG_ISA */

	ep = &boardp->eep_config.asc_eep;



	seq_printf(m,
@@ -3171,7 +3171,6 @@ static void asc_prt_adv_board_eeprom(struct seq_file *m, struct Scsi_Host *shost 
static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)

{

	struct asc_board *boardp = shost_priv(shost);

	int chip_scsi_id;



	seq_printf(m,

		"\nLinux Driver Configuration and Information for AdvanSys SCSI Host %d:\n",
@@ -3197,12 +3196,6 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost) 
		   boardp->asc_n_io_port);



	seq_printf(m, " io_port 0x%lx\n", shost->io_port);



	if (ASC_NARROW_BOARD(boardp)) {

		chip_scsi_id = boardp->dvc_cfg.asc_dvc_cfg.chip_scsi_id;

	} else {

		chip_scsi_id = boardp->dvc_var.adv_dvc_var.chip_scsi_id;

	}

}



/*
@@ -6111,7 +6104,6 @@ static int AdvISR(ADV_DVC_VAR *asc_dvc) 
{

	AdvPortAddr iop_base;

	uchar int_stat;

	ushort target_bit;

	ADV_CARR_T *free_carrp;

	__le32 irq_next_vpa;

	ADV_SCSI_REQ_Q *scsiq;
@@ -6198,8 +6190,6 @@ static int AdvISR(ADV_DVC_VAR *asc_dvc) 
		asc_dvc->carr_freelist = free_carrp;

		asc_dvc->carr_pending_cnt--;



		target_bit = ADV_TID_TO_TIDMASK(scsiq->target_id);



		/*

		 * Clear request microcode control flag.

		 */