Skip to content

L
linux
Commit 8c028a40 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: amd: acp-pcm-dma: remove snd_pcm_ops 

snd_pcm_ops is no longer needed.
Let's use component driver callback.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87imp7af1t.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent f52368f3
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 34 deletions
sound/soc/amd/acp-pcm-dma.c
View file @ 8c028a40
...@@ -759,14 +759,12 @@ static irqreturn_t dma_irq_handler(int irq, void *arg) ...@@ -759,14 +759,12 @@ static irqreturn_t dma_irq_handler(int irq, void *arg)
return IRQ_NONE; return IRQ_NONE;
} }
static int acp_dma_open(struct snd_pcm_substream *substream) static int acp_dma_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
u16 bank; u16 bank;
int ret = 0; int ret = 0;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *prtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(prtd,
DRV_NAME);
struct audio_drv_data *intr_data = dev_get_drvdata(component->dev); struct audio_drv_data *intr_data = dev_get_drvdata(component->dev);
struct audio_substream_data *adata = struct audio_substream_data *adata =
kzalloc(sizeof(struct audio_substream_data), GFP_KERNEL); kzalloc(sizeof(struct audio_substream_data), GFP_KERNEL);
...@@ -834,7 +832,8 @@ static int acp_dma_open(struct snd_pcm_substream *substream) ...@@ -834,7 +832,8 @@ static int acp_dma_open(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int acp_dma_hw_params(struct snd_pcm_substream *substream, static int acp_dma_hw_params(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
int status; int status;
...@@ -843,8 +842,6 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, ...@@ -843,8 +842,6 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_runtime *runtime; struct snd_pcm_runtime *runtime;
struct audio_substream_data *rtd; struct audio_substream_data *rtd;
struct snd_soc_pcm_runtime *prtd = substream->private_data; struct snd_soc_pcm_runtime *prtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(prtd,
DRV_NAME);
struct audio_drv_data *adata = dev_get_drvdata(component->dev); struct audio_drv_data *adata = dev_get_drvdata(component->dev);
struct snd_soc_card *card = prtd->card; struct snd_soc_card *card = prtd->card;
struct acp_platform_info *pinfo = snd_soc_card_get_drvdata(card); struct acp_platform_info *pinfo = snd_soc_card_get_drvdata(card);
...@@ -995,7 +992,8 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, ...@@ -995,7 +992,8 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream,
return status; return status;
} }
static int acp_dma_hw_free(struct snd_pcm_substream *substream) static int acp_dma_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
...@@ -1011,7 +1009,8 @@ static u64 acp_get_byte_count(struct audio_substream_data *rtd) ...@@ -1011,7 +1009,8 @@ static u64 acp_get_byte_count(struct audio_substream_data *rtd)
return byte_count.bytescount; return byte_count.bytescount;
} }
static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream) static snd_pcm_uframes_t acp_dma_pointer(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
u32 buffersize; u32 buffersize;
u32 pos = 0; u32 pos = 0;
...@@ -1053,13 +1052,15 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream) ...@@ -1053,13 +1052,15 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream)
return bytes_to_frames(runtime, pos); return bytes_to_frames(runtime, pos);
} }
static int acp_dma_mmap(struct snd_pcm_substream *substream, static int acp_dma_mmap(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
return snd_pcm_lib_default_mmap(substream, vma); return snd_pcm_lib_default_mmap(substream, vma);
} }
static int acp_dma_prepare(struct snd_pcm_substream *substream) static int acp_dma_prepare(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 audio_substream_data *rtd = runtime->private_data; struct audio_substream_data *rtd = runtime->private_data;
...@@ -1086,7 +1087,8 @@ static int acp_dma_prepare(struct snd_pcm_substream *substream) ...@@ -1086,7 +1087,8 @@ static int acp_dma_prepare(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) static int acp_dma_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int cmd)
{ {
int ret; int ret;
...@@ -1132,10 +1134,9 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -1132,10 +1134,9 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd)
return ret; return ret;
} }
static int acp_dma_new(struct snd_soc_pcm_runtime *rtd) static int acp_dma_new(struct snd_soc_component *component,
struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd,
DRV_NAME);
struct audio_drv_data *adata = dev_get_drvdata(component->dev); struct audio_drv_data *adata = dev_get_drvdata(component->dev);
struct device *parent = component->dev->parent; struct device *parent = component->dev->parent;
...@@ -1158,14 +1159,12 @@ static int acp_dma_new(struct snd_soc_pcm_runtime *rtd) ...@@ -1158,14 +1159,12 @@ static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int acp_dma_close(struct snd_pcm_substream *substream) static int acp_dma_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
u16 bank; u16 bank;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct audio_substream_data *rtd = runtime->private_data; struct audio_substream_data *rtd = runtime->private_data;
struct snd_soc_pcm_runtime *prtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(prtd,
DRV_NAME);
struct audio_drv_data *adata = dev_get_drvdata(component->dev); struct audio_drv_data *adata = dev_get_drvdata(component->dev);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
...@@ -1216,22 +1215,18 @@ static int acp_dma_close(struct snd_pcm_substream *substream) ...@@ -1216,22 +1215,18 @@ static int acp_dma_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static const struct snd_pcm_ops acp_dma_ops = { static const struct snd_soc_component_driver acp_asoc_platform = {
.name = DRV_NAME,
.open = acp_dma_open, .open = acp_dma_open,
.close = acp_dma_close, .close = acp_dma_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_soc_pcm_lib_ioctl,
.hw_params = acp_dma_hw_params, .hw_params = acp_dma_hw_params,
.hw_free = acp_dma_hw_free, .hw_free = acp_dma_hw_free,
.trigger = acp_dma_trigger, .trigger = acp_dma_trigger,
.pointer = acp_dma_pointer, .pointer = acp_dma_pointer,
.mmap = acp_dma_mmap, .mmap = acp_dma_mmap,
.prepare = acp_dma_prepare, .prepare = acp_dma_prepare,
}; .pcm_construct = acp_dma_new,
static const struct snd_soc_component_driver acp_asoc_platform = {
.name = DRV_NAME,
.ops = &acp_dma_ops,
.pcm_new = acp_dma_new,
}; };
static int acp_audio_probe(struct platform_device *pdev) static int acp_audio_probe(struct platform_device *pdev)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7