iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: atmel: atmel-pcm-pdc: remove snd_pcm_ops

Browse Source 
snd_pcm_ops is no longer needed.
Let's use component driver callback.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h84raf1o.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-10-02 14:32:03 +09:00 committed by Mark Brown
parent 8c028a4038
commit a94e3f2dd2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sound/soc/atmel/atmel-pcm-pdc.c
View File

@ -56,15 +56,17 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
return 0; return 0;
} }
static int atmel_pcm_mmap(struct snd_pcm_substream *substream, static int atmel_pcm_mmap(struct snd_soc_component *component,
struct vm_area_struct *vma) struct snd_pcm_substream *substream,
struct vm_area_struct *vma)
{ {
return remap_pfn_range(vma, vma->vm_start, return remap_pfn_range(vma, vma->vm_start,
substream->dma_buffer.addr >> PAGE_SHIFT, substream->dma_buffer.addr >> PAGE_SHIFT,
vma->vm_end - vma->vm_start, vma->vm_page_prot); vma->vm_end - vma->vm_start, vma->vm_page_prot);
} }
static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) static int atmel_pcm_new(struct snd_soc_component *component,
struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_card *card = rtd->card->snd_card; struct snd_card *card = rtd->card->snd_card;
struct snd_pcm *pcm = rtd->pcm; struct snd_pcm *pcm = rtd->pcm;
@ -93,7 +95,8 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
return ret; return ret;
} }
static void atmel_pcm_free(struct snd_pcm *pcm) static void atmel_pcm_free(struct snd_soc_component *component,
struct snd_pcm *pcm)
{ {
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct snd_dma_buffer *buf; struct snd_dma_buffer *buf;
@ -196,8 +199,9 @@ static void atmel_pcm_dma_irq(u32 ssc_sr,
/*--------------------------------------------------------------------------*\ /*--------------------------------------------------------------------------*\
* PCM operations * PCM operations
\*--------------------------------------------------------------------------*/ \*--------------------------------------------------------------------------*/
static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, static int atmel_pcm_hw_params(struct snd_soc_component *component,
struct snd_pcm_hw_params *params) struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct atmel_runtime_data *prtd = runtime->private_data; struct atmel_runtime_data *prtd = runtime->private_data;
@ -225,7 +229,8 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int atmel_pcm_hw_free(struct snd_pcm_substream *substream) static int atmel_pcm_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct atmel_runtime_data *prtd = substream->runtime->private_data; struct atmel_runtime_data *prtd = substream->runtime->private_data;
struct atmel_pcm_dma_params *params = prtd->params; struct atmel_pcm_dma_params *params = prtd->params;
@ -239,7 +244,8 @@ static int atmel_pcm_hw_free(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int atmel_pcm_prepare(struct snd_pcm_substream *substream) static int atmel_pcm_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct atmel_runtime_data *prtd = substream->runtime->private_data; struct atmel_runtime_data *prtd = substream->runtime->private_data;
struct atmel_pcm_dma_params *params = prtd->params; struct atmel_pcm_dma_params *params = prtd->params;
@ -251,8 +257,8 @@ static int atmel_pcm_prepare(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int atmel_pcm_trigger(struct snd_pcm_substream *substream, static int atmel_pcm_trigger(struct snd_soc_component *component,
int cmd) struct snd_pcm_substream *substream, int cmd)
{ {
struct snd_pcm_runtime *rtd = substream->runtime; struct snd_pcm_runtime *rtd = substream->runtime;
struct atmel_runtime_data *prtd = rtd->private_data; struct atmel_runtime_data *prtd = rtd->private_data;
@ -317,8 +323,8 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream,
return ret; return ret;
} }
static snd_pcm_uframes_t atmel_pcm_pointer( static snd_pcm_uframes_t atmel_pcm_pointer(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct atmel_runtime_data *prtd = runtime->private_data; struct atmel_runtime_data *prtd = runtime->private_data;
@ -335,7 +341,8 @@ static snd_pcm_uframes_t atmel_pcm_pointer(
return x; return x;
} }
static int atmel_pcm_open(struct snd_pcm_substream *substream) static int atmel_pcm_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct atmel_runtime_data *prtd; struct atmel_runtime_data *prtd;
@ -360,7 +367,8 @@ static int atmel_pcm_open(struct snd_pcm_substream *substream)
return ret; return ret;
} }
static int atmel_pcm_close(struct snd_pcm_substream *substream) static int atmel_pcm_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct atmel_runtime_data *prtd = substream->runtime->private_data; struct atmel_runtime_data *prtd = substream->runtime->private_data;
@ -368,22 +376,18 @@ static int atmel_pcm_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static const struct snd_pcm_ops atmel_pcm_ops = { static const struct snd_soc_component_driver atmel_soc_platform = {
.open = atmel_pcm_open, .open = atmel_pcm_open,
.close = atmel_pcm_close, .close = atmel_pcm_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_soc_pcm_lib_ioctl,
.hw_params = atmel_pcm_hw_params, .hw_params = atmel_pcm_hw_params,
.hw_free = atmel_pcm_hw_free, .hw_free = atmel_pcm_hw_free,
.prepare = atmel_pcm_prepare, .prepare = atmel_pcm_prepare,
.trigger = atmel_pcm_trigger, .trigger = atmel_pcm_trigger,
.pointer = atmel_pcm_pointer, .pointer = atmel_pcm_pointer,
.mmap = atmel_pcm_mmap, .mmap = atmel_pcm_mmap,
}; .pcm_construct = atmel_pcm_new,
.pcm_destruct = atmel_pcm_free,
static struct snd_soc_component_driver atmel_soc_platform = {
.ops = &atmel_pcm_ops,
.pcm_new = atmel_pcm_new,
.pcm_free = atmel_pcm_free,
}; };
int atmel_pcm_pdc_platform_register(struct device *dev) int atmel_pcm_pdc_platform_register(struct device *dev)