From f521ab504a90141f77c57d573994f7462ad5dc15 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 2 Jul 2018 18:33:39 -0500 Subject: [PATCH 1/5] [SQUASHME] ASoC: SOF: intel: bdw: make variables static Detected with Sparse, variables need to be static if not declared Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/bdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c index 47d3896329d25b..dc21d1fac43323 100644 --- a/sound/soc/sof/intel/bdw.c +++ b/sound/soc/sof/intel/bdw.c @@ -730,7 +730,7 @@ static struct snd_soc_dai_driver bdw_dai[] = { }, }; -struct snd_sof_dai_drv bdw_dai_drv = { +static struct snd_sof_dai_drv bdw_dai_drv = { .drv = bdw_dai, .num_drv = ARRAY_SIZE(bdw_dai) }; From 5cddd66b21de09f223243c953a2df08364ad92a8 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 2 Jul 2018 18:35:45 -0500 Subject: [PATCH 2/5] [SQUASHME] ASoC: SOF: intel: byt: make variables static Detected with Sparse, variables need to be static if not declared Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/byt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c index 77a2c7a041cc96..49ec019b45d0fa 100644 --- a/sound/soc/sof/intel/byt.c +++ b/sound/soc/sof/intel/byt.c @@ -799,12 +799,12 @@ static struct snd_soc_dai_driver byt_dai[] = { }, }; -struct snd_sof_dai_drv byt_dai_drv = { +static struct snd_sof_dai_drv byt_dai_drv = { .drv = byt_dai, .num_drv = 3, /* we have only 3 SSPs on byt*/ }; -struct snd_sof_dai_drv cht_dai_drv = { +static struct snd_sof_dai_drv cht_dai_drv = { .drv = byt_dai, /* all 6 SSPs may be available for cherrytrail */ .num_drv = ARRAY_SIZE(byt_dai), From b66b1f36b507472850b0536f3650c949e6575df1 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 2 Jul 2018 18:36:37 -0500 Subject: [PATCH 3/5] [SQUASHME] ASoC: SOF: intel: hda-dai: add include file Detected with Sparse, variables need to be static if not declared Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/hda-dai.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 091fcc1a7e66a0..9df9c4990eb109 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -10,6 +10,7 @@ #include #include "../sof-priv.h" +#include "hda.h" #define SKL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE) From a4b9529a2c2d6f0825b05f3febc6bcf2d50d3645 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 2 Jul 2018 18:37:57 -0500 Subject: [PATCH 4/5] [SQUASHME] ASoC: SOF: intel: hsw: make variables static Detected with Sparse, variables need to be static if not declared Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/hsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hsw.c b/sound/soc/sof/intel/hsw.c index 5e2c50b47b7502..1a8cbd3af50e13 100644 --- a/sound/soc/sof/intel/hsw.c +++ b/sound/soc/sof/intel/hsw.c @@ -730,7 +730,7 @@ static struct snd_soc_dai_driver hsw_dai[] = { }, }; -struct snd_sof_dai_drv hsw_dai_drv = { +static struct snd_sof_dai_drv hsw_dai_drv = { .drv = hsw_dai, .num_drv = ARRAY_SIZE(hsw_dai) }; From 58b55a55a71f462a6b02289d43963b1c1ab0b499 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 2 Jul 2018 18:38:47 -0500 Subject: [PATCH 5/5] [SQUASHME] ASoC: SOF: intel: skl: remove unused function Detected with Sparse, remove for now Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/skl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c index adb85a579b697e..86097bbea1ad58 100644 --- a/sound/soc/sof/intel/skl.c +++ b/sound/soc/sof/intel/skl.c @@ -40,11 +40,6 @@ static const struct snd_sof_debugfs_map skl_dsp_debugfs[] = { {"dsp", HDA_DSP_BAR, 0, 0x10000}, }; -int skl_run_firmware(struct snd_sof_dev *sdev) -{ - return 0; -} - /* skylake ops */ struct snd_sof_dsp_ops sof_skl_ops = { /* probe and remove */