aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2016-08-16 19:28:21 -0400
committerMark Brown <broonie@kernel.org>2016-08-17 05:32:11 -0400
commitcac17731df11e076850c46f50a17266181a10b7c (patch)
treed6d7697a9ec129f1fe1dcc1db6df745e36c13b31
parentd7e60d52ac8cbc6eb9baa2c8d1e6d0478b8dadd4 (diff)
ASoC: Intel: atom: fix 0-day warnings
spurious __initconst copy/pasted from other drivers Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/atom/sst/sst_acpi.c2
-rw-r--r--sound/soc/intel/boards/bytcr_rt5640.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index 0c2cc4207b95..773acfbaaf2f 100644
--- a/sound/soc/intel/atom/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -245,7 +245,7 @@ static int is_byt_cr(struct device *dev, bool *bytcr)
245 int status = 0; 245 int status = 0;
246 246
247 if (IS_ENABLED(CONFIG_IOSF_MBI)) { 247 if (IS_ENABLED(CONFIG_IOSF_MBI)) {
248 static const struct x86_cpu_id cpu_ids[] __initconst = { 248 static const struct x86_cpu_id cpu_ids[] = {
249 { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */ 249 { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */
250 {} 250 {}
251 }; 251 };
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 09ec3d718357..254881594c36 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -668,7 +668,7 @@ static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */
668 668
669static bool is_valleyview(void) 669static bool is_valleyview(void)
670{ 670{
671 static const struct x86_cpu_id cpu_ids[] __initconst = { 671 static const struct x86_cpu_id cpu_ids[] = {
672 { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */ 672 { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */
673 {} 673 {}
674 }; 674 };