Commit 84a03740 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 74fb9831

include/sound/memalloc.h

+0 −19
Original line number Diff line number Diff line
@@ -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 */

include/sound/pcm.h

+0 −11
Original line number Diff line number Diff line
@@ -1273,17 +1273,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