redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops 

The symbols 'dummy_dma_ops' is declared with different data types by
sound/soc/soc-utils.c and arch/arm64/include/asm/dma-mapping.h. This
leads to conflicts when soc-utils.c (indirectly) includes dma-mapping.h:

sound/soc/soc-utils.c:282:33: error: conflicting types for 'dummy_dma_ops'
  static const struct snd_pcm_ops dummy_dma_ops = {
                                  ^
...
arch/arm64/include/asm/dma-mapping.h:27:33: note: previous declaration of 'dummy_dma_ops' was here
  extern const struct dma_map_ops dummy_dma_ops;
                                  ^

Rename the symbol in soc-utils.c to 'snd_dummy_dma_ops' to avoid the
conflict.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Matthias Kaehlcke 2018-09-25 11:09:14 -07:00 committed by Mark Brown
parent 85aa0fe73e
commit 42cfb412e2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/soc-utils.c
View File

@ -273,13 +273,13 @@ static int dummy_dma_open(struct snd_pcm_substream *substream)
return 0;
}
static const struct snd_pcm_ops dummy_dma_ops = {
static const struct snd_pcm_ops snd_dummy_dma_ops = {
.open = dummy_dma_open,
.ioctl = snd_pcm_lib_ioctl,
};
static const struct snd_soc_component_driver dummy_platform = {
.ops = &dummy_dma_ops,
.ops = &snd_dummy_dma_ops,
};
static const struct snd_soc_component_driver dummy_codec = {