diff options
| author |   Matthias Kaehlcke <mka@chromium.org> | 2018-09-25 11:09:14 -0700 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-09-27 23:15:46 +0100 |
| commit | 42cfb412e24ffbb46d6de9590293bc44f921a0fb (patch) | |
| tree | f6987d8b2808cfa0709fb2bb0aab7fe1766c3624 /sound/soc/soc-utils.c | |
| parent | ASoC: max98088: add OF support (diff) | |
| download | wireguard-linux-42cfb412e24ffbb46d6de9590293bc44f921a0fb.tar.xz wireguard-linux-42cfb412e24ffbb46d6de9590293bc44f921a0fb.zip | |
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>
Diffstat (limited to 'sound/soc/soc-utils.c')
| -rw-r--r-- | sound/soc/soc-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index e0c93496c0cd..e3b9dd634c6d 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -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 = { |