leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sound: sgio2audio: use vmalloc buffer helper functions

Browse Source 
Remove this duplicate of snd_pcm_alloc_vmalloc_buffer and use the
equivalent core functions instead.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2009-12-18 09:30:24 +01:00 committed by Takashi Iwai
parent d20fb5dc07
commit 6cedf8696d
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sound/mips/sgio2audio.c
View File

@ -26,7 +26,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -603,25 +602,14 @@ static int snd_sgio2audio_pcm_close(struct snd_pcm_substream *substream)
static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream, static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; return snd_pcm_lib_alloc_vmalloc_buffer(substream,
int size = params_buffer_bytes(hw_params); params_buffer_bytes(hw_params));
/* alloc virtual 'dma' area */
if (runtime->dma_area)
vfree(runtime->dma_area);
runtime->dma_area = vmalloc_user(size);
if (runtime->dma_area == NULL)
return -ENOMEM;
runtime->dma_bytes = size;
return 0;
} }
/* hw_free callback */ /* hw_free callback */
static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream) static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
vfree(substream->runtime->dma_area); return snd_pcm_lib_free_vmalloc_buffer(substream);
substream->runtime->dma_area = NULL;
return 0;
} }
/* prepare callback */ /* prepare callback */
@ -692,13 +680,6 @@ snd_sgio2audio_pcm_pointer(struct snd_pcm_substream *substream)
chip->channel[chan->idx].pos); chip->channel[chan->idx].pos);
} }
/* get the physical page pointer on the given offset */
static struct page *snd_sgio2audio_page(struct snd_pcm_substream *substream,
unsigned long offset)
{
return vmalloc_to_page(substream->runtime->dma_area + offset);
}
/* operators */ /* operators */
static struct snd_pcm_ops snd_sgio2audio_playback1_ops = { static struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
.open = snd_sgio2audio_playback1_open, .open = snd_sgio2audio_playback1_open,
@ -709,7 +690,7 @@ static struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
.prepare = snd_sgio2audio_pcm_prepare, .prepare = snd_sgio2audio_pcm_prepare,
.trigger = snd_sgio2audio_pcm_trigger, .trigger = snd_sgio2audio_pcm_trigger,
.pointer = snd_sgio2audio_pcm_pointer, .pointer = snd_sgio2audio_pcm_pointer,
.page = snd_sgio2audio_page, .page = snd_pcm_lib_get_vmalloc_page,
}; };
static struct snd_pcm_ops snd_sgio2audio_playback2_ops = { static struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
@ -721,7 +702,7 @@ static struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
.prepare = snd_sgio2audio_pcm_prepare, .prepare = snd_sgio2audio_pcm_prepare,
.trigger = snd_sgio2audio_pcm_trigger, .trigger = snd_sgio2audio_pcm_trigger,
.pointer = snd_sgio2audio_pcm_pointer, .pointer = snd_sgio2audio_pcm_pointer,
.page = snd_sgio2audio_page, .page = snd_pcm_lib_get_vmalloc_page,
}; };
static struct snd_pcm_ops snd_sgio2audio_capture_ops = { static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
@ -733,7 +714,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
.prepare = snd_sgio2audio_pcm_prepare, .prepare = snd_sgio2audio_pcm_prepare,
.trigger = snd_sgio2audio_pcm_trigger, .trigger = snd_sgio2audio_pcm_trigger,
.pointer = snd_sgio2audio_pcm_pointer, .pointer = snd_sgio2audio_pcm_pointer,
.page = snd_sgio2audio_page, .page = snd_pcm_lib_get_vmalloc_page,
}; };
/* /*