Commit aeb64ff3 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mauro Carvalho Chehab

media: cobalt: Clean up ALSA PCM API usages

With the recent change in ALSA PCM core, the whole open-coded vmalloc
buffer handling in this driver can be dropped by replacing with the
managed buffer allocation.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8079c5d5
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/vmalloc.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
...@@ -244,48 +243,6 @@ static int snd_cobalt_pcm_ioctl(struct snd_pcm_substream *substream, ...@@ -244,48 +243,6 @@ static int snd_cobalt_pcm_ioctl(struct snd_pcm_substream *substream,
return snd_pcm_lib_ioctl(substream, cmd, arg); return snd_pcm_lib_ioctl(substream, cmd, arg);
} }
static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
size_t size)
{
struct snd_pcm_runtime *runtime = subs->runtime;
dprintk("Allocating vbuffer\n");
if (runtime->dma_area) {
if (runtime->dma_bytes > size)
return 0;
vfree(runtime->dma_area);
}
runtime->dma_area = vmalloc(size);
if (!runtime->dma_area)
return -ENOMEM;
runtime->dma_bytes = size;
return 0;
}
static int snd_cobalt_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
dprintk("%s called\n", __func__);
return snd_pcm_alloc_vmalloc_buffer(substream,
params_buffer_bytes(params));
}
static int snd_cobalt_pcm_hw_free(struct snd_pcm_substream *substream)
{
if (substream->runtime->dma_area) {
dprintk("freeing pcm capture region\n");
vfree(substream->runtime->dma_area);
substream->runtime->dma_area = NULL;
}
return 0;
}
static int snd_cobalt_pcm_prepare(struct snd_pcm_substream *substream) static int snd_cobalt_pcm_prepare(struct snd_pcm_substream *substream)
{ {
struct snd_cobalt_card *cobsc = snd_pcm_substream_chip(substream); struct snd_cobalt_card *cobsc = snd_pcm_substream_chip(substream);
...@@ -490,36 +447,22 @@ snd_pcm_uframes_t snd_cobalt_pcm_pb_pointer(struct snd_pcm_substream *substream) ...@@ -490,36 +447,22 @@ snd_pcm_uframes_t snd_cobalt_pcm_pb_pointer(struct snd_pcm_substream *substream)
substream->runtime->buffer_size; substream->runtime->buffer_size;
} }
static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
unsigned long offset)
{
void *pageptr = subs->runtime->dma_area + offset;
return vmalloc_to_page(pageptr);
}
static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = { static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = {
.open = snd_cobalt_pcm_capture_open, .open = snd_cobalt_pcm_capture_open,
.close = snd_cobalt_pcm_capture_close, .close = snd_cobalt_pcm_capture_close,
.ioctl = snd_cobalt_pcm_ioctl, .ioctl = snd_cobalt_pcm_ioctl,
.hw_params = snd_cobalt_pcm_hw_params,
.hw_free = snd_cobalt_pcm_hw_free,
.prepare = snd_cobalt_pcm_prepare, .prepare = snd_cobalt_pcm_prepare,
.trigger = snd_cobalt_pcm_trigger, .trigger = snd_cobalt_pcm_trigger,
.pointer = snd_cobalt_pcm_pointer, .pointer = snd_cobalt_pcm_pointer,
.page = snd_pcm_get_vmalloc_page,
}; };
static const struct snd_pcm_ops snd_cobalt_pcm_playback_ops = { static const struct snd_pcm_ops snd_cobalt_pcm_playback_ops = {
.open = snd_cobalt_pcm_playback_open, .open = snd_cobalt_pcm_playback_open,
.close = snd_cobalt_pcm_playback_close, .close = snd_cobalt_pcm_playback_close,
.ioctl = snd_cobalt_pcm_ioctl, .ioctl = snd_cobalt_pcm_ioctl,
.hw_params = snd_cobalt_pcm_hw_params,
.hw_free = snd_cobalt_pcm_hw_free,
.prepare = snd_cobalt_pcm_pb_prepare, .prepare = snd_cobalt_pcm_pb_prepare,
.trigger = snd_cobalt_pcm_pb_trigger, .trigger = snd_cobalt_pcm_pb_trigger,
.pointer = snd_cobalt_pcm_pb_pointer, .pointer = snd_cobalt_pcm_pb_pointer,
.page = snd_pcm_get_vmalloc_page,
}; };
int snd_cobalt_pcm_create(struct snd_cobalt_card *cobsc) int snd_cobalt_pcm_create(struct snd_cobalt_card *cobsc)
...@@ -555,6 +498,8 @@ int snd_cobalt_pcm_create(struct snd_cobalt_card *cobsc) ...@@ -555,6 +498,8 @@ int snd_cobalt_pcm_create(struct snd_cobalt_card *cobsc)
snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE,
&snd_cobalt_pcm_capture_ops); &snd_cobalt_pcm_capture_ops);
snd_pcm_set_managed_buffer_all(sp, SNDRV_DMA_TYPE_VMALLOC,
NULL, 0, 0);
sp->info_flags = 0; sp->info_flags = 0;
sp->private_data = cobsc; sp->private_data = cobsc;
strscpy(sp->name, "cobalt", sizeof(sp->name)); strscpy(sp->name, "cobalt", sizeof(sp->name));
...@@ -579,6 +524,8 @@ int snd_cobalt_pcm_create(struct snd_cobalt_card *cobsc) ...@@ -579,6 +524,8 @@ int snd_cobalt_pcm_create(struct snd_cobalt_card *cobsc)
snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_PLAYBACK, snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_PLAYBACK,
&snd_cobalt_pcm_playback_ops); &snd_cobalt_pcm_playback_ops);
snd_pcm_set_managed_buffer_all(sp, SNDRV_DMA_TYPE_VMALLOC,
NULL, 0, 0);
sp->info_flags = 0; sp->info_flags = 0;
sp->private_data = cobsc; sp->private_data = cobsc;
strscpy(sp->name, "cobalt", sizeof(sp->name)); strscpy(sp->name, "cobalt", sizeof(sp->name));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment