From f30554c2711224a6ecf6e875c964183fbc4c5445 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 21 Jul 2020 17:41:27 +0100 Subject: [PATCH] scsi: qla4xxx: Move 'qla4_82xx_reg_tbl' to the only place its used MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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: Lee Jones Signed-off-by: Martin K. Petersen --- drivers/scsi/qla4xxx/ql4_nx.h | 17 ----------------- drivers/scsi/qla4xxx/ql4_os.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_nx.h b/drivers/scsi/qla4xxx/ql4_nx.h index 98fe78613eb7..b7a6e7f169ca 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.h +++ b/drivers/scsi/qla4xxx/ql4_nx.h @@ -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 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 27064c602dc7..2572f7aef8f8 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -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, -- 2.11.0