From: Lee Jones Date: Tue, 21 Jul 2020 16:41:22 +0000 (+0100) Subject: scsi: qla4xxx: Move 'qla4_83xx_reg_tbl' from shared header X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ca2c203ed99944da2e687e49acad7a9935c1610;p=linux.git scsi: qla4xxx: Move 'qla4_83xx_reg_tbl' from shared header 'qla4_83xx_reg_tbl' is only used in 'drivers/scsi/qla4xxx/ql4_os.c', move it there. Fixes the following W=1 kernel build warning(s): In file included from drivers/scsi/qla4xxx/ql4_def.h:46, from drivers/scsi/qla4xxx/ql4_init.c:9: At top level: drivers/scsi/qla4xxx/ql4_83xx.h:90:23: warning: ‘qla4_83xx_reg_tbl’ defined but not used [-Wunused-const-variable=] 90 | static const uint32_t qla4_83xx_reg_tbl[] = { | ^~~~~~~~~~~~~~~~~ In file included from drivers/scsi/qla4xxx/ql4_def.h:46, from drivers/scsi/qla4xxx/ql4_mbx.c:9: drivers/scsi/qla4xxx/ql4_83xx.h:90:23: warning: ‘qla4_83xx_reg_tbl’ defined but not used [-Wunused-const-variable=] 90 | static const uint32_t qla4_83xx_reg_tbl[] = { | ^~~~~~~~~~~~~~~~~ [...] NB: Lots of these - snipped for brevity. Link: https://lore.kernel.org/r/20200721164148.2617584-15-lee.jones@linaro.org Cc: QLogic-Storage-Upstream@qlogic.com Signed-off-by: Lee Jones Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/qla4xxx/ql4_83xx.h b/drivers/scsi/qla4xxx/ql4_83xx.h index 775fdf9fcc876..f34583e5f8dee 100644 --- a/drivers/scsi/qla4xxx/ql4_83xx.h +++ b/drivers/scsi/qla4xxx/ql4_83xx.h @@ -87,23 +87,6 @@ #define QLA83XX_FW_API 0x356C #define QLA83XX_DRV_OP_MODE 0x3570 -static const uint32_t qla4_83xx_reg_tbl[] = { - QLA83XX_PEG_HALT_STATUS1, - QLA83XX_PEG_HALT_STATUS2, - QLA83XX_PEG_ALIVE_COUNTER, - QLA83XX_CRB_DRV_ACTIVE, - QLA83XX_CRB_DEV_STATE, - QLA83XX_CRB_DRV_STATE, - QLA83XX_CRB_DRV_SCRATCH, - QLA83XX_CRB_DEV_PART_INFO1, - QLA83XX_CRB_IDC_VER_MAJOR, - QLA83XX_FW_VER_MAJOR, - QLA83XX_FW_VER_MINOR, - QLA83XX_FW_VER_SUB, - QLA83XX_CMDPEG_STATE, - QLA83XX_ASIC_TEMP, -}; - #define QLA83XX_CRB_WIN_BASE 0x3800 #define QLA83XX_CRB_WIN_FUNC(f) (QLA83XX_CRB_WIN_BASE+((f)*4)) #define QLA83XX_SEM_LOCK_BASE 0x3840 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 5dc697ce8b5dd..97fa290cf295f 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_83xx_reg_tbl[] = { + QLA83XX_PEG_HALT_STATUS1, + QLA83XX_PEG_HALT_STATUS2, + QLA83XX_PEG_ALIVE_COUNTER, + QLA83XX_CRB_DRV_ACTIVE, + QLA83XX_CRB_DEV_STATE, + QLA83XX_CRB_DRV_STATE, + QLA83XX_CRB_DRV_SCRATCH, + QLA83XX_CRB_DEV_PART_INFO1, + QLA83XX_CRB_IDC_VER_MAJOR, + QLA83XX_FW_VER_MAJOR, + QLA83XX_FW_VER_MINOR, + QLA83XX_FW_VER_SUB, + QLA83XX_CMDPEG_STATE, + QLA83XX_ASIC_TEMP, +}; + static struct scsi_host_template qla4xxx_driver_template = { .module = THIS_MODULE, .name = DRIVER_NAME,