On 1/17/17, 10:02 AM, "Bart Van Assche" <bart.vanassche@xxxxxxxxxxx> wrote: >This patch avoids that building with W=1 triggers compiler >warnings similar to the following: > >drivers/scsi/qla2xxx/qla_nx2.h:538:23: warning: ‘qla8044_reg_tbl’ defined but not used [-Wunused-const-variable=] > >Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> >Cc: Quinn Tran <quinn.tran@xxxxxxxxxx> >Cc: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx> >Cc: Christoph Hellwig <hch@xxxxxx> >--- > drivers/scsi/qla2xxx/qla_nx.c | 5 +++++ > drivers/scsi/qla2xxx/qla_nx.h | 3 +-- > drivers/scsi/qla2xxx/qla_nx2.c | 17 +++++++++++++++++ > drivers/scsi/qla2xxx/qla_nx2.h | 17 ----------------- > 4 files changed, 23 insertions(+), 19 deletions(-) > >diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c >index 54380b434b30..0a1723cc08cf 100644 >--- a/drivers/scsi/qla2xxx/qla_nx.c >+++ b/drivers/scsi/qla2xxx/qla_nx.c >@@ -42,6 +42,11 @@ static int qla82xx_crb_table_initialized; > (crb_addr_xform[QLA82XX_HW_PX_MAP_CRB_##name] = \ > QLA82XX_HW_CRB_HUB_AGT_ADR_##name << 20) > >+const int MD_MIU_TEST_AGT_RDDATA[] = { >+ 0x410000A8, 0x410000AC, >+ 0x410000B8, 0x410000BC >+}; >+ > static void qla82xx_crb_addr_transform_setup(void) > { > qla82xx_crb_addr_transform(XDMA); >diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h >index 6201dce3553b..77624eac95a4 100644 >--- a/drivers/scsi/qla2xxx/qla_nx.h >+++ b/drivers/scsi/qla2xxx/qla_nx.h >@@ -1176,8 +1176,7 @@ struct qla82xx_md_entry_queue { > #define MD_MIU_TEST_AGT_ADDR_LO 0x41000094 > #define MD_MIU_TEST_AGT_ADDR_HI 0x41000098 > >-static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC, >- 0x410000B8, 0x410000BC }; >+extern const int MD_MIU_TEST_AGT_RDDATA[4]; > > #define CRB_NIU_XG_PAUSE_CTL_P0 0x1 > #define CRB_NIU_XG_PAUSE_CTL_P1 0x8 >diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c >index 007192d7bad8..dc1ec9b61027 100644 >--- a/drivers/scsi/qla2xxx/qla_nx2.c >+++ b/drivers/scsi/qla2xxx/qla_nx2.c >@@ -15,6 +15,23 @@ > > #define TIMEOUT_100_MS 100 > >+static const uint32_t qla8044_reg_tbl[] = { >+ QLA8044_PEG_HALT_STATUS1, >+ QLA8044_PEG_HALT_STATUS2, >+ QLA8044_PEG_ALIVE_COUNTER, >+ QLA8044_CRB_DRV_ACTIVE, >+ QLA8044_CRB_DEV_STATE, >+ QLA8044_CRB_DRV_STATE, >+ QLA8044_CRB_DRV_SCRATCH, >+ QLA8044_CRB_DEV_PART_INFO1, >+ QLA8044_CRB_IDC_VER_MAJOR, >+ QLA8044_FW_VER_MAJOR, >+ QLA8044_FW_VER_MINOR, >+ QLA8044_FW_VER_SUB, >+ QLA8044_CMDPEG_STATE, >+ QLA8044_ASIC_TEMP, >+}; >+ > /* 8044 Flash Read/Write functions */ > uint32_t > qla8044_rd_reg(struct qla_hw_data *ha, ulong addr) >diff --git a/drivers/scsi/qla2xxx/qla_nx2.h b/drivers/scsi/qla2xxx/qla_nx2.h >index 02fe3c4cdf55..83c1b7e17c80 100644 >--- a/drivers/scsi/qla2xxx/qla_nx2.h >+++ b/drivers/scsi/qla2xxx/qla_nx2.h >@@ -535,23 +535,6 @@ enum qla_regs { > #define CRB_CMDPEG_CHECK_RETRY_COUNT 60 > #define CRB_CMDPEG_CHECK_DELAY 500 > >-static const uint32_t qla8044_reg_tbl[] = { >- QLA8044_PEG_HALT_STATUS1, >- QLA8044_PEG_HALT_STATUS2, >- QLA8044_PEG_ALIVE_COUNTER, >- QLA8044_CRB_DRV_ACTIVE, >- QLA8044_CRB_DEV_STATE, >- QLA8044_CRB_DRV_STATE, >- QLA8044_CRB_DRV_SCRATCH, >- QLA8044_CRB_DEV_PART_INFO1, >- QLA8044_CRB_IDC_VER_MAJOR, >- QLA8044_FW_VER_MAJOR, >- QLA8044_FW_VER_MINOR, >- QLA8044_FW_VER_SUB, >- QLA8044_CMDPEG_STATE, >- QLA8044_ASIC_TEMP, >-}; >- > /* MiniDump Structures */ > > /* Driver_code is for driver to write some info about the entry >-- >2.11.0 > Looks Good. Acked-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx> > ��.n��������+%������w��{.n����j�����{ay�ʇڙ���f���h������_�(�階�ݢj"��������G����?���&��