Commit 1fc65919 authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: hpsa: Strip out a bunch of set but unused variables 

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

 drivers/scsi/hpsa.c: In function ‘hpsa_volume_offline’:
 drivers/scsi/hpsa.c:3885:5: warning: variable ‘scsi_status’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/hpsa.c:3884:6: warning: variable ‘cmd_status’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/hpsa.c: In function ‘hpsa_update_scsi_devices’:
 drivers/scsi/hpsa.c:4354:9: warning: variable ‘n_ext_target_devs’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/hpsa.c: In function ‘hpsa_scatter_gather’:
 drivers/scsi/hpsa.c:4583:36: warning: variable ‘last_sg’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/hpsa.c: In function ‘hpsa_init_one’:
 drivers/scsi/hpsa.c:8639:6: warning: variable ‘dac’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/hpsa.c: In function ‘hpsa_enter_performant_mode’:
 drivers/scsi/hpsa.c:9300:7: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]

Link: https://lore.kernel.org/r/20201112101929.GC1997862@dell


Cc: Don Brace <don.brace@microchip.com>
Cc: Bugfixes to <esc.storagedev@microsemi.com>
Cc: storagedev@microchip.com
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6081b12c

drivers/scsi/hpsa.c

+7 −18
Original line number Diff line number Diff line
@@ -3881,8 +3881,6 @@ static unsigned char hpsa_volume_offline(struct ctlr_info *h, 
	u8 sense_key, asc, ascq;

	int sense_len;

	int rc, ldstat = 0;

	u16 cmd_status;

	u8 scsi_status;

#define ASC_LUN_NOT_READY 0x04

#define ASCQ_LUN_NOT_READY_FORMAT_IN_PROGRESS 0x04

#define ASCQ_LUN_NOT_READY_INITIALIZING_CMD_REQ 0x02
@@ -3902,8 +3900,6 @@ static unsigned char hpsa_volume_offline(struct ctlr_info *h, 
	else

		sense_len = c->err_info->SenseLen;

	decode_sense_data(sense, sense_len, &sense_key, &asc, &ascq);

	cmd_status = c->err_info->CommandStatus;

	scsi_status = c->err_info->ScsiStatus;

	cmd_free(h, c);



	/* Determine the reason for not ready state */
@@ -4351,7 +4347,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h) 
	u32 ndev_allocated = 0;

	struct hpsa_scsi_dev_t **currentsd, *this_device, *tmpdevice;

	int ncurrent = 0;

	int i, n_ext_target_devs, ndevs_to_allocate;

	int i, ndevs_to_allocate;

	int raid_ctlr_position;

	bool physical_device;

	DECLARE_BITMAP(lunzerobits, MAX_EXT_TARGETS);
@@ -4416,7 +4412,6 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h) 
		raid_ctlr_position = nphysicals + nlogicals;



	/* adjust our table of devices */

	n_ext_target_devs = 0;

	for (i = 0; i < nphysicals + nlogicals + 1; i++) {

		u8 *lunaddrbytes, is_OBDR = 0;

		int rc = 0;
@@ -4580,7 +4575,7 @@ static int hpsa_scatter_gather(struct ctlr_info *h, 
		struct scsi_cmnd *cmd)

{

	struct scatterlist *sg;

	int use_sg, i, sg_limit, chained, last_sg;

	int use_sg, i, sg_limit, chained;

	struct SGDescriptor *curr_sg;



	BUG_ON(scsi_sg_count(cmd) > h->maxsgentries);
@@ -4602,7 +4597,6 @@ static int hpsa_scatter_gather(struct ctlr_info *h, 
	curr_sg = cp->SG;

	chained = use_sg > h->max_cmd_sg_entries;

	sg_limit = chained ? h->max_cmd_sg_entries - 1 : use_sg;

	last_sg = scsi_sg_count(cmd) - 1;

	scsi_for_each_sg(cmd, sg, sg_limit, i) {

		hpsa_set_sg_descriptor(curr_sg, sg);

		curr_sg++;
@@ -8635,7 +8629,7 @@ static struct ctlr_info *hpda_alloc_ctlr_info(void) 


static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	int dac, rc;

	int rc;

	struct ctlr_info *h;

	int try_soft_reset = 0;

	unsigned long flags;
@@ -8711,13 +8705,9 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* configure PCI DMA stuff */

	rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));

	if (rc == 0) {

		dac = 1;

	} else {

	if (rc != 0) {

		rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc == 0) {

			dac = 0;

		} else {

		if (rc != 0) {

			dev_err(&pdev->dev, "no suitable DMA available\n");

			goto clean3;	/* shost, pci, lu, aer/h */

		}
@@ -9296,9 +9286,8 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support) 
	} else if (trans_support & CFGTBL_Trans_io_accel2) {

		u64 cfg_offset, cfg_base_addr_index;

		u32 bft2_offset, cfg_base_addr;

		int rc;



		rc = hpsa_find_cfg_addrs(h->pdev, h->vaddr, &cfg_base_addr,

		hpsa_find_cfg_addrs(h->pdev, h->vaddr, &cfg_base_addr,

				    &cfg_base_addr_index, &cfg_offset);

		BUILD_BUG_ON(offsetof(struct io_accel2_cmd, sg) != 64);

		bft2[15] = h->ioaccel_maxsg + HPSA_IOACCEL2_HEADER_SZ;