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

scsi: bfa: Remove a few unused variables 'pgoff' and 't' 

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

 drivers/scsi/bfa/bfa_ioc.c: In function ‘bfa_iocpf_sm_fwcheck_entry’:
 drivers/scsi/bfa/bfa_ioc.c:704:27: warning: variable ‘pgoff’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/bfa/bfa_ioc.c: In function ‘bfa_ioc_fwver_get’:
 drivers/scsi/bfa/bfa_ioc.c:1443:13: warning: variable ‘pgoff’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/bfa/bfa_ioc.c: In function ‘bfa_ioc_fwsig_invalidate’:
 drivers/scsi/bfa/bfa_ioc.c:1665:13: warning: variable ‘pgoff’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/bfa/bfa_ioc.c: In function ‘bfa_ioc_download_fw’:
 drivers/scsi/bfa/bfa_ioc.c:1866:13: warning: variable ‘pgoff’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/bfa/bfa_ioc.c: In function ‘bfa_diag_memtest_done’:
 drivers/scsi/bfa/bfa_ioc.c:4766:13: warning: variable ‘pgoff’ set but not used [-Wunused-but-set-variable]
 drivers/scsi/bfa/bfa_ioc.c: In function ‘bfa_flash_fifo_flush’:
 drivers/scsi/bfa/bfa_ioc.c:6787:6: warning: variable ‘t’ set but not used [-Wunused-but-set-variable]

Link: https://lore.kernel.org/r/20200723122446.1329773-21-lee.jones@linaro.org


Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com>
Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 22f8c077

drivers/scsi/bfa/bfa_ioc.c

+6 −14
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static void 
bfa_iocpf_sm_fwcheck_entry(struct bfa_iocpf_s *iocpf)

{

	struct bfi_ioc_image_hdr_s	fwhdr;

	u32	r32, fwstate, pgnum, pgoff, loff = 0;

	u32	r32, fwstate, pgnum, loff = 0;

	int	i;



	/*
@@ -731,7 +731,6 @@ bfa_iocpf_sm_fwcheck_entry(struct bfa_iocpf_s *iocpf) 
	 * Clear fwver hdr

	 */

	pgnum = PSS_SMEM_PGNUM(iocpf->ioc->ioc_regs.smem_pg0, loff);

	pgoff = PSS_SMEM_PGOFF(loff);

	writel(pgnum, iocpf->ioc->ioc_regs.host_page_num_fn);



	for (i = 0; i < sizeof(struct bfi_ioc_image_hdr_s) / sizeof(u32); i++) {
@@ -1440,13 +1439,12 @@ bfa_ioc_lpu_stop(struct bfa_ioc_s *ioc) 
void

bfa_ioc_fwver_get(struct bfa_ioc_s *ioc, struct bfi_ioc_image_hdr_s *fwhdr)

{

	u32	pgnum, pgoff;

	u32	pgnum;

	u32	loff = 0;

	int		i;

	u32	*fwsig = (u32 *) fwhdr;



	pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);

	pgoff = PSS_SMEM_PGOFF(loff);

	writel(pgnum, ioc->ioc_regs.host_page_num_fn);



	for (i = 0; i < (sizeof(struct bfi_ioc_image_hdr_s) / sizeof(u32));
@@ -1662,7 +1660,7 @@ bfa_status_t 
bfa_ioc_fwsig_invalidate(struct bfa_ioc_s *ioc)

{



	u32	pgnum, pgoff;

	u32	pgnum;

	u32	loff = 0;

	enum bfi_ioc_state ioc_fwstate;
@@ -1671,7 +1669,6 @@ bfa_ioc_fwsig_invalidate(struct bfa_ioc_s *ioc) 
		return BFA_STATUS_ADAPTER_ENABLED;



	pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);

	pgoff = PSS_SMEM_PGOFF(loff);

	writel(pgnum, ioc->ioc_regs.host_page_num_fn);

	bfa_mem_write(ioc->ioc_regs.smem_page_start, loff, BFA_IOC_FW_INV_SIGN);
@@ -1863,7 +1860,7 @@ bfa_ioc_download_fw(struct bfa_ioc_s *ioc, u32 boot_type, 
		    u32 boot_env)

{

	u32 *fwimg;

	u32 pgnum, pgoff;

	u32 pgnum;

	u32 loff = 0;

	u32 chunkno = 0;

	u32 i;
@@ -1892,8 +1889,6 @@ bfa_ioc_download_fw(struct bfa_ioc_s *ioc, u32 boot_type, 




	pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);

	pgoff = PSS_SMEM_PGOFF(loff);



	writel(pgnum, ioc->ioc_regs.host_page_num_fn);



	for (i = 0; i < fwimg_size; i++) {
@@ -4763,11 +4758,9 @@ bfa_diag_memtest_done(void *cbarg) 
	struct bfa_ioc_s  *ioc = diag->ioc;

	struct bfa_diag_memtest_result *res = diag->result;

	u32	loff = BFI_BOOT_MEMTEST_RES_ADDR;

	u32	pgnum, pgoff, i;

	u32	pgnum, i;



	pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);

	pgoff = PSS_SMEM_PGOFF(loff);



	writel(pgnum, ioc->ioc_regs.host_page_num_fn);



	for (i = 0; i < (sizeof(struct bfa_diag_memtest_result) /
@@ -6784,7 +6777,6 @@ static u32 
bfa_flash_fifo_flush(void __iomem *pci_bar)

{

	u32 i;

	u32 t;

	union bfa_flash_dev_status_reg_u dev_status;



	dev_status.i = readl(pci_bar + FLI_DEV_STATUS_REG);
@@ -6794,7 +6786,7 @@ bfa_flash_fifo_flush(void __iomem *pci_bar) 


	/* fifo counter in terms of words */

	for (i = 0; i < dev_status.r.fifo_cnt; i++)

		t = readl(pci_bar + FLI_RDDATA_REG);

		readl(pci_bar + FLI_RDDATA_REG);



	/*

	 * Check the device status. It may take some time.

CRA Git | Maintained and supported by SUSTech CRA and CCSE