diff mbox series

[2/5] ALSA: core: Drop snd_sgbuf_get_ptr()

Message ID 20210609162551.7842-3-tiwai@suse.de
State Accepted
Commit 84a0374051c1582ed9ace6cd63cdbfb15ed4b797
Headers show
Series ALSA: More abstracition of memory alloc helpers | expand

Commit Message

Takashi Iwai June 9, 2021, 4:25 p.m. UTC 
snd_sgbuf_get_ptr() and its sibling snd_pcm_sgbuf_get_ptr() are no
longer used by any drivers.  Let's drop them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 include/sound/memalloc.h | 19 -------------------
 include/sound/pcm.h      | 11 -----------
 2 files changed, 30 deletions(-)
diff mbox series

Patch

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 2e1200d17d0c..11e0a68335bd 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -1272,17 +1272,6 @@  snd_pcm_sgbuf_get_addr(struct snd_pcm_substream *substream, unsigned int ofs)
 	return snd_sgbuf_get_addr(snd_pcm_get_dma_buf(substream), 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