Commit 5e1c5c5a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: Drop PCM vmalloc buffer helpers 



As the last-standing user of PCM vmalloc buffer helper API took its
own buffer management, we can finally drop those API functions, which
were leftover after reorganization of ALSA memalloc code.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807152725.18948-3-tiwai@suse.de
parent 002353a5

include/sound/pcm.h

+0 −42
Original line number Diff line number Diff line
@@ -1358,48 +1358,6 @@ snd_pcm_set_fixed_buffer_all(struct snd_pcm *pcm, int type, 
	return snd_pcm_set_managed_buffer_all(pcm, type, data, size, 0);

}



int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,

				      size_t size, gfp_t gfp_flags);

int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream);

struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,

					  unsigned long offset);

/**

 * snd_pcm_lib_alloc_vmalloc_buffer - allocate virtual DMA buffer

 * @substream: the substream to allocate the buffer to

 * @size: the requested buffer size, in bytes

 *

 * Allocates the PCM substream buffer using vmalloc(), i.e., the memory is

 * contiguous in kernel virtual space, but not in physical memory.  Use this

 * if the buffer is accessed by kernel code but not by device DMA.

 *

 * Return: 1 if the buffer was changed, 0 if not changed, or a negative error

 * code.

 */

static inline int snd_pcm_lib_alloc_vmalloc_buffer

			(struct snd_pcm_substream *substream, size_t size)

{

	return _snd_pcm_lib_alloc_vmalloc_buffer(substream, size,

						 GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);

}



/**

 * snd_pcm_lib_alloc_vmalloc_32_buffer - allocate 32-bit-addressable buffer

 * @substream: the substream to allocate the buffer to

 * @size: the requested buffer size, in bytes

 *

 * This function works like snd_pcm_lib_alloc_vmalloc_buffer(), but uses

 * vmalloc_32(), i.e., the pages are allocated from 32-bit-addressable memory.

 *

 * Return: 1 if the buffer was changed, 0 if not changed, or a negative error

 * code.

 */

static inline int snd_pcm_lib_alloc_vmalloc_32_buffer

			(struct snd_pcm_substream *substream, size_t size)

{

	return _snd_pcm_lib_alloc_vmalloc_buffer(substream, size,

						 GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);

}



#define snd_pcm_get_dma_buf(substream) ((substream)->runtime->dma_buffer_p)



/**

sound/core/pcm_memory.c

+0 −59
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/init.h>

#include <linux/slab.h>

#include <linux/moduleparam.h>

#include <linux/vmalloc.h>

#include <linux/export.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -497,61 +496,3 @@ int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream) 
	return 0;

}

EXPORT_SYMBOL(snd_pcm_lib_free_pages);
 


int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,

				      size_t size, gfp_t gfp_flags)

{

	struct snd_pcm_runtime *runtime;



	if (PCM_RUNTIME_CHECK(substream))

		return -EINVAL;

	runtime = substream->runtime;

	if (runtime->dma_area) {

		if (runtime->dma_bytes >= size)

			return 0; /* already large enough */

		vfree(runtime->dma_area);

	}

	runtime->dma_area = __vmalloc(size, gfp_flags);

	if (!runtime->dma_area)

		return -ENOMEM;

	runtime->dma_bytes = size;

	return 1;

}

EXPORT_SYMBOL(_snd_pcm_lib_alloc_vmalloc_buffer);



/**

 * snd_pcm_lib_free_vmalloc_buffer - free vmalloc buffer

 * @substream: the substream with a buffer allocated by

 *	snd_pcm_lib_alloc_vmalloc_buffer()

 *

 * Return: Zero if successful, or a negative error code on failure.

 */

int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime;



	if (PCM_RUNTIME_CHECK(substream))

		return -EINVAL;

	runtime = substream->runtime;

	vfree(runtime->dma_area);

	runtime->dma_area = NULL;

	return 0;

}

EXPORT_SYMBOL(snd_pcm_lib_free_vmalloc_buffer);



/**

 * snd_pcm_lib_get_vmalloc_page - map vmalloc buffer offset to page struct

 * @substream: the substream with a buffer allocated by

 *	snd_pcm_lib_alloc_vmalloc_buffer()

 * @offset: offset in the buffer

 *

 * This function is to be used as the page callback in the PCM ops.

 *

 * Return: The page struct, or %NULL on failure.

 */

struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,

					  unsigned long offset)

{

	return vmalloc_to_page(substream->runtime->dma_area + offset);

}

EXPORT_SYMBOL(snd_pcm_lib_get_vmalloc_page);