• Matthias Kaehlcke's avatar
    ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops · 42cfb412
    Matthias Kaehlcke authored
    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: default avatarMatthias Kaehlcke <mka@chromium.org>
    Signed-off-by: default avatarMark Brown <broonie@kernel.org>
    42cfb412
soc-utils.c 9.11 KB