Commit 8cfb8e40 authored Oct 09, 2019 by zhengbin Committed by Martin K. Petersen Oct 09, 2019

scsi: megaraid_sas: remove unused variables 'debugBlk','fusion'

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/scsi/megaraid/megaraid_sas_fp.c: In function MR_GetSpanBlock:
drivers/scsi/megaraid/megaraid_sas_fp.c:400:16: warning: variable debugBlk set but not used [-Wunused-but-set-variable]
drivers/scsi/megaraid/megaraid_sas_fp.c: In function mr_spanset_get_phy_params:
drivers/scsi/megaraid/megaraid_sas_fp.c:713:25: warning: variable fusion set but not used [-Wunused-but-set-variable]
drivers/scsi/megaraid/megaraid_sas_fp.c: In function MR_GetPhyParams:
drivers/scsi/megaraid/megaraid_sas_fp.c:815:25: warning: variable fusion set but not used [-Wunused-but-set-variable]

'debugBlk' is introduced by commit 9c915a8c ("[SCSI] megaraid_sas:
Add 9565/9285 specific code"), but never used, so remove it

'fusion' is not used since commit c365178f ("scsi: megaraid_sas:
use adapter_type for all gen controllers")

Link: https://lore.kernel.org/r/1570605824-89133-1-git-send-email-zhengbin13@huawei.com


Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent ff7ca7fd

drivers/scsi/megaraid/megaraid_sas_fp.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -386,9 +386,8 @@ u32 MR_GetSpanBlock(u32 ld, u64 row, u64 *span_blk,
		le64_to_cpu(quad->logEnd) && (mega_mod64(row - le64_to_cpu(quad->logStart),
		le32_to_cpu(quad->diff))) == 0) {
		if (span_blk != NULL) {
		u64 blk, debugBlk;
		u64 blk;
		blk = mega_div64_32((row-le64_to_cpu(quad->logStart)), le32_to_cpu(quad->diff));
		debugBlk = blk;

		blk = (blk + le64_to_cpu(quad->offsetInSpan)) << raid->stripeShift;
		*span_blk = blk;
		@@ -699,9 +698,7 @@ static u8 mr_spanset_get_phy_params(struct megasas_instance *instance, u32 ld,
		__le16 *pDevHandle = &io_info->devHandle;
		u8 *pPdInterface = &io_info->pd_interface;
		u32 logArm, rowMod, armQ, arm;
		struct fusion_context *fusion;

		fusion = instance->ctrl_context;
		*pDevHandle = cpu_to_le16(MR_DEVHANDLE_INVALID);

		/Get row and span from io_info for Uneven Span IO./
		@@ -801,9 +798,7 @@ u8 MR_GetPhyParams(struct megasas_instance *instance, u32 ld, u64 stripRow,
		u64 *pdBlock = &io_info->pdBlock;
		__le16 *pDevHandle = &io_info->devHandle;
		u8 *pPdInterface = &io_info->pd_interface;
		struct fusion_context *fusion;

		fusion = instance->ctrl_context;
		*pDevHandle = cpu_to_le16(MR_DEVHANDLE_INVALID);

		row = mega_div64_32(stripRow, raid->rowDataSize);

Admin message