diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-07 13:03:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-07 13:03:23 +0100 |
| commit | ce1d4d26b8ee536cdcc45b97db31e40be0ff5aa3 (patch) | |
| tree | bedf906bb542310d5ae6b05ce293a4b10fd0e176 /sound | |
| parent | 5146b6a92c1194674f21def93d7025c97ed6977f (diff) | |
| parent | 343403e2dad897a3c6c974a43d760b4fb96b996b (diff) | |
Merge series "ASoC: amd: remove warnings with make W=1" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Yet another cleanup series, with good findings of variables not used
for anything.
Pierre-Louis Bossart (6):
ASoC: amd: acp-da7219-max98357a: fix 'defined but not used' warning
ASoC: amd: acp-rt5645: fix 'defined but not used' warning
ASoC: amd: raven: acp3x-pcm-dma: fix 'set but not used' warning
ASoC: amd: raven: acp3x-i2s: fix 'set but not used' warning
ASoC: amd: raven: acp3x-pcm-dma: remove unused-but-set variable
ASoC: amd: raven: acp3x-i2s: remove unused-but-set variable
sound/soc/amd/acp-da7219-max98357a.c | 2 ++
sound/soc/amd/acp-rt5645.c | 2 ++
sound/soc/amd/raven/acp3x-i2s.c | 4 ----
sound/soc/amd/raven/acp3x-pcm-dma.c | 4 ----
4 files changed, 4 insertions(+), 8 deletions(-)
--
2.25.1
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/amd/acp-da7219-max98357a.c | 2 | ||||
| -rw-r--r-- | sound/soc/amd/acp-rt5645.c | 2 | ||||
| -rw-r--r-- | sound/soc/amd/raven/acp3x-i2s.c | 4 | ||||
| -rw-r--r-- | sound/soc/amd/raven/acp3x-pcm-dma.c | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 9414d7269c4f..7d8986379d80 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -450,11 +450,13 @@ static int cz_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_ACPI static const struct acpi_device_id cz_audio_acpi_match[] = { { "AMD7219", 0 }, {}, }; MODULE_DEVICE_TABLE(acpi, cz_audio_acpi_match); +#endif static struct platform_driver cz_pcm_driver = { .driver = { diff --git a/sound/soc/amd/acp-rt5645.c b/sound/soc/amd/acp-rt5645.c index 73b31f88a6b5..87f0060e771f 100644 --- a/sound/soc/amd/acp-rt5645.c +++ b/sound/soc/amd/acp-rt5645.c @@ -182,11 +182,13 @@ static int cz_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_ACPI static const struct acpi_device_id cz_audio_acpi_match[] = { { "AMDI1002", 0 }, {}, }; MODULE_DEVICE_TABLE(acpi, cz_audio_acpi_match); +#endif static struct platform_driver cz_pcm_driver = { .driver = { diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 14607563abd2..c3eb9b347eaa 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -149,14 +149,10 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { struct i2s_stream_instance *rtd; - struct snd_soc_pcm_runtime *prtd; - struct snd_soc_card *card; u32 ret, val, period_bytes, reg_val, ier_val, water_val; u32 buf_size, buf_reg; - prtd = substream->private_data; rtd = substream->runtime->private_data; - card = prtd->card; period_bytes = frames_to_bytes(substream->runtime, substream->runtime->period_size); buf_size = frames_to_bytes(substream->runtime, diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 5bd458e0fe31..17290c829c4b 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -301,15 +301,11 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *prtd; - struct snd_soc_card *card; struct i2s_stream_instance *rtd; u32 pos; u32 buffersize; u64 bytescount; - prtd = substream->private_data; - card = prtd->card; rtd = substream->runtime->private_data; buffersize = frames_to_bytes(substream->runtime, |