Commit 94685e7a authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: nsp32: Remove or exclude unused variables 

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

 drivers/scsi/nsp32.c: In function ‘nsp32_selection_autoscsi’:
 drivers/scsi/nsp32.c:584:17: warning: variable ‘execph’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/nsp32.c: In function ‘nsp32_msgout_occur’:
 drivers/scsi/nsp32.c:1785:7: warning: variable ‘new_sgtp’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/nsp32.c: In function ‘nsp32_analyze_sdtr’:
 drivers/scsi/nsp32.c:2227:20: warning: variable ‘syncnum’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/nsp32.c:2223:20: warning: variable ‘synct’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/nsp32.c: In function ‘nsp32_do_bus_reset’:
 drivers/scsi/nsp32.c:2841:17: warning: variable ‘intrdat’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/nsp32.c: In function ‘nsp32_getprom_param’:
 drivers/scsi/nsp32.c:2912:11: warning: variable ‘val’ set but not used [-Wunused-but-set-variable]

Link: https://lore.kernel.org/r/20210317091125.2910058-4-lee.jones@linaro.org


Cc: GOTO Masanori <gotom@debian.or.jp>
Cc: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: gotom@debian.org
Cc: linux-scsi@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 66730771

drivers/scsi/nsp32.c

+4 −19
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ static int nsp32_selection_autoscsi(struct scsi_cmnd *SCpnt) 
	int		status;

	unsigned short	command	= 0;

	unsigned int	msgout  = 0;

	unsigned short	execph;

	int		i;



	nsp32_dbg(NSP32_DEBUG_AUTOSCSI, "in");
@@ -605,7 +604,7 @@ static int nsp32_selection_autoscsi(struct scsi_cmnd *SCpnt) 
	/*

	 * clear execph

	 */

	execph = nsp32_read2(base, SCSI_EXECUTE_PHASE);

	nsp32_read2(base, SCSI_EXECUTE_PHASE);



	/*

	 * clear FIFO counter to set CDBs
@@ -1781,8 +1780,6 @@ static void nsp32_msgout_occur(struct scsi_cmnd *SCpnt) 
{

	nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;

	unsigned int base   = SCpnt->device->host->io_port;

	//unsigned short command;

	long new_sgtp;

	int i;

	

	nsp32_dbg(NSP32_DEBUG_MSGOUTOCCUR,
@@ -1796,14 +1793,6 @@ static void nsp32_msgout_occur(struct scsi_cmnd *SCpnt) 
		nsp32_build_nop(SCpnt);

	}



	/*

	 * Set SGTP ADDR current entry for restarting AUTOSCSI, 

	 * because SGTP is incremented next point.

	 * There is few statement in the specification...

	 */

 	new_sgtp = data->cur_lunt->sglun_paddr + 

		   (data->cur_lunt->cur_entry * sizeof(nsp32_sgtable));



	/*

	 * send messages

	 */
@@ -2220,17 +2209,12 @@ static void nsp32_analyze_sdtr(struct scsi_cmnd *SCpnt) 
{

	nsp32_hw_data   *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;

	nsp32_target     *target     = data->cur_target;

	nsp32_sync_table *synct;

	unsigned char     get_period = data->msginbuf[3];

	unsigned char     get_offset = data->msginbuf[4];

	int               entry;

	int               syncnum;



	nsp32_dbg(NSP32_DEBUG_MSGINOCCUR, "enter");



	synct   = data->synct;

	syncnum = data->syncnum;



	/*

	 * If this inititor sent the SDTR message, then target responds SDTR,

	 * initiator SYNCREG, ACKWIDTH from SDTR parameter.
@@ -2838,8 +2822,8 @@ static int nsp32_eh_abort(struct scsi_cmnd *SCpnt) 
static void nsp32_do_bus_reset(nsp32_hw_data *data)

{

	unsigned int   base = data->BaseAddress;

	unsigned short intrdat;

	int i;

	unsigned short __maybe_unused intrdat;



	nsp32_dbg(NSP32_DEBUG_BUSRESET, "in");
@@ -2909,7 +2893,8 @@ static int nsp32_getprom_param(nsp32_hw_data *data) 
{

	int vendor = data->pci_devid->vendor;

	int device = data->pci_devid->device;

	int ret, val, i;

	int ret, i;

	int __maybe_unused val;



	/*

	 * EEPROM checking.