| Message ID | 20201218153400.18394-1-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f2283366c2919fda71e6eb725c3e5c1bd47bae1a |
| Headers | show |
| Series | ALSA: pcm: Remove snd_pcm_lib_preallocate_dma_free() | expand |
On Fri, 18 Dec 2020 16:34:00 +0100, Lars-Peter Clausen wrote: > > Since commit d4cfb30fce03 ("ALSA: pcm: Set per-card upper limit of PCM > buffer allocations") snd_pcm_lib_preallocate_dma_free() is a single line > function that has one caller, which is another single line function. > > Clean this up a bit and remove snd_pcm_lib_preallocate_dma_free() and > directly call do_free_pages() from snd_pcm_lib_preallocate_free(). This is > a bit less boilerplate. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Thanks, applied. Takashi
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index 4f03ba8ed0ae..ee6e9c5eec45 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c @@ -89,14 +89,6 @@ static int preallocate_pcm_pages(struct snd_pcm_substream *substream, size_t siz return 0; } -/* - * release the preallocated buffer if not yet done. - */ -static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream) -{ - do_free_pages(substream->pcm->card, &substream->dma_buffer); -} - /** * snd_pcm_lib_preallocate_free - release the preallocated buffer of the specified substream. * @substream: the pcm substream instance @@ -105,7 +97,7 @@ static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream */ void snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream) { - snd_pcm_lib_preallocate_dma_free(substream); + do_free_pages(substream->pcm->card, &substream->dma_buffer); } /**
Since commit d4cfb30fce03 ("ALSA: pcm: Set per-card upper limit of PCM buffer allocations") snd_pcm_lib_preallocate_dma_free() is a single line function that has one caller, which is another single line function. Clean this up a bit and remove snd_pcm_lib_preallocate_dma_free() and directly call do_free_pages() from snd_pcm_lib_preallocate_free(). This is a bit less boilerplate. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/core/pcm_memory.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)