a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: pcm: Use static inline for snd_pcm_lib_alloc_vmalloc_buffer()

Browse Source 
... instead of #if 0 hack.  It's more straightforward and obvious.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-10-30 13:45:58 +01:00
parent 12cddbd869
commit f213d8f79a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/sound/pcm.h
View File

@ -942,7 +942,6 @@ int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,
int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream); 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, struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,
unsigned long offset); unsigned long offset);
#if 0 /* for kernel-doc */
/** /**
* snd_pcm_lib_alloc_vmalloc_buffer - allocate virtual DMA buffer * snd_pcm_lib_alloc_vmalloc_buffer - allocate virtual DMA buffer
* @substream: the substream to allocate the buffer to * @substream: the substream to allocate the buffer to
@ -955,8 +954,13 @@ struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,
* Return: 1 if the buffer was changed, 0 if not changed, or a negative error * Return: 1 if the buffer was changed, 0 if not changed, or a negative error
* code. * code.
*/ */
static int snd_pcm_lib_alloc_vmalloc_buffer static inline int snd_pcm_lib_alloc_vmalloc_buffer
(struct snd_pcm_substream *substream, size_t size); (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 * snd_pcm_lib_alloc_vmalloc_32_buffer - allocate 32-bit-addressable buffer
* @substream: the substream to allocate the buffer to * @substream: the substream to allocate the buffer to
@ -968,15 +972,12 @@ static int snd_pcm_lib_alloc_vmalloc_buffer
* Return: 1 if the buffer was changed, 0 if not changed, or a negative error * Return: 1 if the buffer was changed, 0 if not changed, or a negative error
* code. * code.
*/ */
static int snd_pcm_lib_alloc_vmalloc_32_buffer static inline int snd_pcm_lib_alloc_vmalloc_32_buffer
(struct snd_pcm_substream *substream, size_t size); (struct snd_pcm_substream *substream, size_t size)
#endif {
#define snd_pcm_lib_alloc_vmalloc_buffer(subs, size) \ return _snd_pcm_lib_alloc_vmalloc_buffer(substream, size,
_snd_pcm_lib_alloc_vmalloc_buffer \ GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
(subs, size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO) }
#define snd_pcm_lib_alloc_vmalloc_32_buffer(subs, size) \
_snd_pcm_lib_alloc_vmalloc_buffer \
(subs, size, GFP_KERNEL | GFP_DMA32 | __GFP_ZERO)
#define snd_pcm_get_dma_buf(substream) ((substream)->runtime->dma_buffer_p) #define snd_pcm_get_dma_buf(substream) ((substream)->runtime->dma_buffer_p)