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

scsi: qla4xxx: Move 'qla4_82xx_reg_tbl' to the only place its used 

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

 In file included from drivers/scsi/qla4xxx/ql4_def.h:43,
 from drivers/scsi/qla4xxx/ql4_mbx.c:9:
 drivers/scsi/qla4xxx/ql4_nx.h:602:23: warning: ‘qla4_82xx_reg_tbl’ defined but not used [-Wunused-const-variable=]
 602 | static const uint32_t qla4_82xx_reg_tbl[] = {
 | ^~~~~~~~~~~~~~~~~
 [...]
 NB: Lots of these

Link: https://lore.kernel.org/r/20200721164148.2617584-20-lee.jones@linaro.org


Cc: QLogic-Storage-Upstream@qlogic.com
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 685f9479

drivers/scsi/qla4xxx/ql4_nx.h

+0 −17
Original line number Diff line number Diff line
@@ -599,23 +599,6 @@ enum qla_regs { 
	QLA8XXX_CRB_TEMP_STATE,

};



static const uint32_t qla4_82xx_reg_tbl[] = {

	QLA82XX_PEG_HALT_STATUS1,

	QLA82XX_PEG_HALT_STATUS2,

	QLA82XX_PEG_ALIVE_COUNTER,

	QLA82XX_CRB_DRV_ACTIVE,

	QLA82XX_CRB_DEV_STATE,

	QLA82XX_CRB_DRV_STATE,

	QLA82XX_CRB_DRV_SCRATCH,

	QLA82XX_CRB_DEV_PART_INFO,

	QLA82XX_CRB_DRV_IDC_VERSION,

	QLA82XX_FW_VERSION_MAJOR,

	QLA82XX_FW_VERSION_MINOR,

	QLA82XX_FW_VERSION_SUB,

	CRB_CMDPEG_STATE,

	CRB_TEMP_STATE,

};



/* Every driver should use these Device State */

#define QLA8XXX_DEV_COLD		1

#define QLA8XXX_DEV_INITIALIZING	2

drivers/scsi/qla4xxx/ql4_os.c

+17 −0
Original line number Diff line number Diff line
@@ -188,6 +188,23 @@ static int qla4xxx_sysfs_ddb_logout_sid(struct iscsi_cls_session *cls_sess); 
static struct qla4_8xxx_legacy_intr_set legacy_intr[] =

    QLA82XX_LEGACY_INTR_CONFIG;



static const uint32_t qla4_82xx_reg_tbl[] = {

	QLA82XX_PEG_HALT_STATUS1,

	QLA82XX_PEG_HALT_STATUS2,

	QLA82XX_PEG_ALIVE_COUNTER,

	QLA82XX_CRB_DRV_ACTIVE,

	QLA82XX_CRB_DEV_STATE,

	QLA82XX_CRB_DRV_STATE,

	QLA82XX_CRB_DRV_SCRATCH,

	QLA82XX_CRB_DEV_PART_INFO,

	QLA82XX_CRB_DRV_IDC_VERSION,

	QLA82XX_FW_VERSION_MAJOR,

	QLA82XX_FW_VERSION_MINOR,

	QLA82XX_FW_VERSION_SUB,

	CRB_CMDPEG_STATE,

	CRB_TEMP_STATE,

};



static const uint32_t qla4_83xx_reg_tbl[] = {

	QLA83XX_PEG_HALT_STATUS1,

	QLA83XX_PEG_HALT_STATUS2,