OSDN Git Service

ASoC: SOF: Intel: Fix unused variable warning
authorYueHaibing <yuehaibing@huawei.com>
Thu, 7 May 2020 07:27:35 +0000 (15:27 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 8 May 2020 10:28:47 +0000 (11:28 +0100)
When CONFIG_SND_SOC_SOF_BAYTRAIL is not set, gcc warns:

sound/soc/sof/intel/byt.c:85:41: warning: ‘cht_debugfs’ defined but not used [-Wunused-const-variable=]
 static const struct snd_sof_debugfs_map cht_debugfs[] = {
                                         ^~~~~~~~~~~
Move the variable inside #ifdef

Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20200507072735.16588-1-yuehaibing@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/byt.c

index f872bb1..3747f2c 100644 (file)
@@ -82,33 +82,6 @@ static const struct snd_sof_debugfs_map byt_debugfs[] = {
         SOF_DEBUGFS_ACCESS_ALWAYS},
 };
 
-static const struct snd_sof_debugfs_map cht_debugfs[] = {
-       {"dmac0", BYT_DSP_BAR, DMAC0_OFFSET, DMAC_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"dmac1", BYT_DSP_BAR,  DMAC1_OFFSET, DMAC_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"dmac2", BYT_DSP_BAR,  DMAC2_OFFSET, DMAC_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"ssp0",  BYT_DSP_BAR, SSP0_OFFSET, SSP_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"ssp1", BYT_DSP_BAR, SSP1_OFFSET, SSP_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"ssp2", BYT_DSP_BAR, SSP2_OFFSET, SSP_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"ssp3", BYT_DSP_BAR, SSP3_OFFSET, SSP_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"ssp4", BYT_DSP_BAR, SSP4_OFFSET, SSP_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"ssp5", BYT_DSP_BAR, SSP5_OFFSET, SSP_SIZE,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-       {"iram", BYT_DSP_BAR, IRAM_OFFSET, IRAM_SIZE,
-        SOF_DEBUGFS_ACCESS_D0_ONLY},
-       {"dram", BYT_DSP_BAR, DRAM_OFFSET, DRAM_SIZE,
-        SOF_DEBUGFS_ACCESS_D0_ONLY},
-       {"shim", BYT_DSP_BAR, SHIM_OFFSET, SHIM_SIZE_CHT,
-        SOF_DEBUGFS_ACCESS_ALWAYS},
-};
-
 static void byt_host_done(struct snd_sof_dev *sdev);
 static void byt_dsp_done(struct snd_sof_dev *sdev);
 static void byt_get_reply(struct snd_sof_dev *sdev);
@@ -681,6 +654,33 @@ EXPORT_SYMBOL_NS(tng_chip_info, SND_SOC_SOF_MERRIFIELD);
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
 
+static const struct snd_sof_debugfs_map cht_debugfs[] = {
+       {"dmac0", BYT_DSP_BAR, DMAC0_OFFSET, DMAC_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"dmac1", BYT_DSP_BAR,  DMAC1_OFFSET, DMAC_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"dmac2", BYT_DSP_BAR,  DMAC2_OFFSET, DMAC_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"ssp0",  BYT_DSP_BAR, SSP0_OFFSET, SSP_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"ssp1", BYT_DSP_BAR, SSP1_OFFSET, SSP_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"ssp2", BYT_DSP_BAR, SSP2_OFFSET, SSP_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"ssp3", BYT_DSP_BAR, SSP3_OFFSET, SSP_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"ssp4", BYT_DSP_BAR, SSP4_OFFSET, SSP_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"ssp5", BYT_DSP_BAR, SSP5_OFFSET, SSP_SIZE,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+       {"iram", BYT_DSP_BAR, IRAM_OFFSET, IRAM_SIZE,
+        SOF_DEBUGFS_ACCESS_D0_ONLY},
+       {"dram", BYT_DSP_BAR, DRAM_OFFSET, DRAM_SIZE,
+        SOF_DEBUGFS_ACCESS_D0_ONLY},
+       {"shim", BYT_DSP_BAR, SHIM_OFFSET, SHIM_SIZE_CHT,
+        SOF_DEBUGFS_ACCESS_ALWAYS},
+};
+
 static int byt_acpi_probe(struct snd_sof_dev *sdev)
 {
        struct snd_sof_pdata *pdata = sdev->pdata;