ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops
authorMatthias Kaehlcke <mka@chromium.org>
Tue, 25 Sep 2018 18:09:14 +0000 (11:09 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 27 Sep 2018 22:15:46 +0000 (23:15 +0100)
commit42cfb412e24ffbb46d6de9590293bc44f921a0fb
treef6987d8b2808cfa0709fb2bb0aab7fe1766c3624
parent85aa0fe73edd856365d074a5aa38c614c8b2ca45
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>
sound/soc/soc-utils.c