Commit 58c2dbe1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: au1x: dbdma2: 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/87ftkbaf1k.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a94e3f2d
...@@ -182,15 +182,15 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd, ...@@ -182,15 +182,15 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd,
return 0; return 0;
} }
static inline struct au1xpsc_audio_dmadata *to_dmadata(struct snd_pcm_substream *ss) static inline struct au1xpsc_audio_dmadata *to_dmadata(struct snd_pcm_substream *ss,
struct snd_soc_component *component)
{ {
struct snd_soc_pcm_runtime *rtd = ss->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct au1xpsc_audio_dmadata *pcd = snd_soc_component_get_drvdata(component); struct au1xpsc_audio_dmadata *pcd = snd_soc_component_get_drvdata(component);
return &pcd[ss->stream]; return &pcd[ss->stream];
} }
static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream, static int au1xpsc_pcm_hw_params(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
...@@ -202,7 +202,7 @@ static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -202,7 +202,7 @@ static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream,
goto out; goto out;
stype = substream->stream; stype = substream->stream;
pcd = to_dmadata(substream); pcd = to_dmadata(substream, component);
DBG("runtime->dma_area = 0x%08lx dma_addr_t = 0x%08lx dma_size = %zu " DBG("runtime->dma_area = 0x%08lx dma_addr_t = 0x%08lx dma_size = %zu "
"runtime->min_align %lu\n", "runtime->min_align %lu\n",
...@@ -232,15 +232,17 @@ static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -232,15 +232,17 @@ static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
static int au1xpsc_pcm_hw_free(struct snd_pcm_substream *substream) static int au1xpsc_pcm_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
snd_pcm_lib_free_pages(substream); snd_pcm_lib_free_pages(substream);
return 0; return 0;
} }
static int au1xpsc_pcm_prepare(struct snd_pcm_substream *substream) static int au1xpsc_pcm_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct au1xpsc_audio_dmadata *pcd = to_dmadata(substream); struct au1xpsc_audio_dmadata *pcd = to_dmadata(substream, component);
au1xxx_dbdma_reset(pcd->ddma_chan); au1xxx_dbdma_reset(pcd->ddma_chan);
...@@ -255,9 +257,10 @@ static int au1xpsc_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -255,9 +257,10 @@ static int au1xpsc_pcm_prepare(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int au1xpsc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) static int au1xpsc_pcm_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int cmd)
{ {
u32 c = to_dmadata(substream)->ddma_chan; u32 c = to_dmadata(substream, component)->ddma_chan;
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
...@@ -275,14 +278,17 @@ static int au1xpsc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -275,14 +278,17 @@ static int au1xpsc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t
au1xpsc_pcm_pointer(struct snd_pcm_substream *substream) au1xpsc_pcm_pointer(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
return bytes_to_frames(substream->runtime, to_dmadata(substream)->pos); return bytes_to_frames(substream->runtime,
to_dmadata(substream, component)->pos);
} }
static int au1xpsc_pcm_open(struct snd_pcm_substream *substream) static int au1xpsc_pcm_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct au1xpsc_audio_dmadata *pcd = to_dmadata(substream); struct au1xpsc_audio_dmadata *pcd = to_dmadata(substream, component);
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
int stype = substream->stream, *dmaids; int stype = substream->stream, *dmaids;
...@@ -296,24 +302,15 @@ static int au1xpsc_pcm_open(struct snd_pcm_substream *substream) ...@@ -296,24 +302,15 @@ static int au1xpsc_pcm_open(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int au1xpsc_pcm_close(struct snd_pcm_substream *substream) static int au1xpsc_pcm_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
au1x_pcm_dbdma_free(to_dmadata(substream)); au1x_pcm_dbdma_free(to_dmadata(substream, component));
return 0; return 0;
} }
static const struct snd_pcm_ops au1xpsc_pcm_ops = { static int au1xpsc_pcm_new(struct snd_soc_component *component,
.open = au1xpsc_pcm_open, struct snd_soc_pcm_runtime *rtd)
.close = au1xpsc_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = au1xpsc_pcm_hw_params,
.hw_free = au1xpsc_pcm_hw_free,
.prepare = au1xpsc_pcm_prepare,
.trigger = au1xpsc_pcm_trigger,
.pointer = au1xpsc_pcm_pointer,
};
static int au1xpsc_pcm_new(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;
...@@ -327,8 +324,15 @@ static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) ...@@ -327,8 +324,15 @@ static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd)
/* au1xpsc audio platform */ /* au1xpsc audio platform */
static struct snd_soc_component_driver au1xpsc_soc_component = { static struct snd_soc_component_driver au1xpsc_soc_component = {
.name = DRV_NAME, .name = DRV_NAME,
.ops = &au1xpsc_pcm_ops, .open = au1xpsc_pcm_open,
.pcm_new = au1xpsc_pcm_new, .close = au1xpsc_pcm_close,
.ioctl = snd_soc_pcm_lib_ioctl,
.hw_params = au1xpsc_pcm_hw_params,
.hw_free = au1xpsc_pcm_hw_free,
.prepare = au1xpsc_pcm_prepare,
.trigger = au1xpsc_pcm_trigger,
.pointer = au1xpsc_pcm_pointer,
.pcm_construct = au1xpsc_pcm_new,
}; };
static int au1xpsc_pcm_drvprobe(struct platform_device *pdev) static int au1xpsc_pcm_drvprobe(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