[PATCH 1/2] ALSA: memalloc: Drop superfluous snd_dma_buffer_sync() declaration
snd_dma_buffer_sync() is declared twice, and the one outside the ifdef CONFIG_HAS_DMA could lead to a build error when CONFIG_HAS_DMA=n. As it's an overlooked leftover after rebase, drop this line.
Fixes: a25684a95646 ("ALSA: memalloc: Support for non-contiguous page allocation") Reported-by: Stephen Rothwell sfr@canb.auug.org.au Link: https://lore.kernel.org/r/20211019165402.4fa82c38@canb.auug.org.au Signed-off-by: Takashi Iwai tiwai@suse.de --- include/sound/memalloc.h | 3 --- 1 file changed, 3 deletions(-)
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index df615052dad4..653dfffb3ac8 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -97,9 +97,6 @@ static inline void snd_dma_buffer_sync(struct snd_dma_buffer *dmab, enum snd_dma_sync_mode mode) {} #endif
-void snd_dma_buffer_sync(struct snd_dma_buffer *dmab, - enum snd_dma_sync_mode mode); - dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, size_t offset); struct page *snd_sgbuf_get_page(struct snd_dma_buffer *dmab, size_t offset); unsigned int snd_sgbuf_get_chunk_size(struct snd_dma_buffer *dmab,
It caused a warning for kernel-doc build.
Fixes: a25684a95646 ("ALSA: memalloc: Support for non-contiguous page allocation") Reported-by: Stephen Rothwell sfr@canb.auug.org.au Link: https://lore.kernel.org/r/20211019165402.4fa82c38@canb.auug.org.au Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/core/memalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index acdebecf1a2e..99cd0f67daa1 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -196,7 +196,7 @@ EXPORT_SYMBOL(snd_dma_buffer_mmap); /** * snd_dma_buffer_sync - sync DMA buffer between CPU and device * @dmab: buffer allocation information - * @mod: sync mode + * @mode: sync mode */ void snd_dma_buffer_sync(struct snd_dma_buffer *dmab, enum snd_dma_sync_mode mode)
participants (1)
-
Takashi Iwai