ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_ops
PATCH 1/1 ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_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_ops' to avoid the conflict.
--- sound/soc/soc-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-utils.c +2 -2
@@ -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_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_ops, };static const struct snd_soc_component_driver dummy_codec = {
Signature · 1 line
2.19.0.605.g01d371f741-goog
Quoted 6 lines · Matthias Kaehlcke
The symbols '
dummy_dma_ops' is declared with different data types bysound/soc/soc-utils.candarch/arm64/include/asm/dma-mapping.h. This leads to conflicts whensoc-utils.c(indirectly) includesdma-mapping.h:
sound/soc/soc-utils.c:282:33: error: conflicting types for 'dummy_dma_ops'
Quoted 8 lines
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.cto 'snd_dummy_ops' to avoid the conflict.
But it misses 'dma' part as I can see they are still DMA related.
snd_dummy_dma_ops ?
Quoted 29 lines
Signed-off-by Matthias Kaehlcke <[email protected]>--- sound/soc/soc-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/soc/soc-utils.c +2
-3@@ -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_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_ops, };static const struct snd_soc_component_driver dummy_codec = { --2.19.0.605.g01d371f741-goog
Signature · 2 lines
With Best Regards, Andy Shevchenko
Mark Brown
maintainerQuoted 10 lines · Andy Shevchenko
Quoted 4 lines · Matthias Kaehlcke
extern const struct dma_map_ops dummy_dma_ops; ^Rename the symbol in
soc-utils.cto 'snd_dummy_ops' to avoid the conflict.But it misses 'dma' part as I can see they are still DMA related.
snd_dummy_dma_ops?
Yes, we have many different set of operations in ALSA, snd_dummy_ops is just inviting further collisions.