summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-06-09 19:25:48 +0300
committerTakashi Iwai <tiwai@suse.de>2021-06-10 11:15:21 +0300
commit84a0374051c1582ed9ace6cd63cdbfb15ed4b797 (patch)
tree6a4271d7853ffb8841494489f4f3d022031b9301
parent74fb98311c4e36632b40b2a16931028c77a7c5de (diff)
downloadlinux-84a0374051c1582ed9ace6cd63cdbfb15ed4b797.tar.xz
ALSA: core: Drop snd_sgbuf_get_ptr()
snd_sgbuf_get_ptr() and its sibling snd_pcm_sgbuf_get_ptr() are no longer used by any drivers. Let's drop them. Link: https://lore.kernel.org/r/20210609162551.7842-3-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/sound/memalloc.h19
-rw-r--r--include/sound/pcm.h11
2 files changed, 0 insertions, 30 deletions
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index 5daa937684a4..3ab084438fdc 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -103,19 +103,6 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab,
return addr + offset % PAGE_SIZE;
}
-/*
- * return the virtual address at the corresponding offset
- */
-static inline void *snd_sgbuf_get_ptr(struct snd_dma_buffer *dmab,
- size_t offset)
-{
- struct snd_sg_buf *sgbuf = dmab->private_data;
-
- if (!sgbuf)
- return dmab->area + offset;
- return sgbuf->table[offset >> PAGE_SHIFT].buf + offset % PAGE_SIZE;
-}
-
unsigned int snd_sgbuf_get_chunk_size(struct snd_dma_buffer *dmab,
unsigned int ofs, unsigned int size);
#else
@@ -126,12 +113,6 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab,
return dmab->addr + offset;
}
-static inline void *snd_sgbuf_get_ptr(struct snd_dma_buffer *dmab,
- size_t offset)
-{
- return dmab->area + offset;
-}
-
#define snd_sgbuf_get_chunk_size(dmab, ofs, size) (size)
#endif /* CONFIG_SND_DMA_SGBUF */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index bae90696cd06..c4f418c511e5 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -1274,17 +1274,6 @@ snd_pcm_sgbuf_get_addr(struct snd_pcm_substream *substream, unsigned int ofs)
}
/**
- * snd_pcm_sgbuf_get_ptr - Get the virtual address at the corresponding offset
- * @substream: PCM substream
- * @ofs: byte offset
- */
-static inline void *
-snd_pcm_sgbuf_get_ptr(struct snd_pcm_substream *substream, unsigned int ofs)
-{
- return snd_sgbuf_get_ptr(snd_pcm_get_dma_buf(substream), ofs);
-}
-
-/**
* snd_pcm_sgbuf_get_chunk_size - Compute the max size that fits within the
* contig. page from the given size
* @substream: PCM substream