Commit 851f5abf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: kirkwood: kirkwood-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/87imp790dp.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1fddf424
...@@ -98,7 +98,8 @@ kirkwood_dma_conf_mbus_windows(void __iomem *base, int win, ...@@ -98,7 +98,8 @@ kirkwood_dma_conf_mbus_windows(void __iomem *base, int win,
} }
} }
static int kirkwood_dma_open(struct snd_pcm_substream *substream) static int kirkwood_dma_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
int err; int err;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
...@@ -160,7 +161,8 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream) ...@@ -160,7 +161,8 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int kirkwood_dma_close(struct snd_pcm_substream *substream) static int kirkwood_dma_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct kirkwood_dma_data *priv = kirkwood_priv(substream); struct kirkwood_dma_data *priv = kirkwood_priv(substream);
...@@ -180,7 +182,8 @@ static int kirkwood_dma_close(struct snd_pcm_substream *substream) ...@@ -180,7 +182,8 @@ static int kirkwood_dma_close(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int kirkwood_dma_hw_params(struct snd_pcm_substream *substream, static int kirkwood_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)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
...@@ -191,13 +194,15 @@ static int kirkwood_dma_hw_params(struct snd_pcm_substream *substream, ...@@ -191,13 +194,15 @@ static int kirkwood_dma_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int kirkwood_dma_hw_free(struct snd_pcm_substream *substream) static int kirkwood_dma_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
snd_pcm_set_runtime_buffer(substream, NULL); snd_pcm_set_runtime_buffer(substream, NULL);
return 0; return 0;
} }
static int kirkwood_dma_prepare(struct snd_pcm_substream *substream) static int kirkwood_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 kirkwood_dma_data *priv = kirkwood_priv(substream); struct kirkwood_dma_data *priv = kirkwood_priv(substream);
...@@ -222,8 +227,9 @@ static int kirkwood_dma_prepare(struct snd_pcm_substream *substream) ...@@ -222,8 +227,9 @@ static int kirkwood_dma_prepare(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream static snd_pcm_uframes_t kirkwood_dma_pointer(
*substream) struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct kirkwood_dma_data *priv = kirkwood_priv(substream); struct kirkwood_dma_data *priv = kirkwood_priv(substream);
snd_pcm_uframes_t count; snd_pcm_uframes_t count;
...@@ -238,16 +244,6 @@ static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream ...@@ -238,16 +244,6 @@ static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream
return count; return count;
} }
static const struct snd_pcm_ops kirkwood_dma_ops = {
.open = kirkwood_dma_open,
.close = kirkwood_dma_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = kirkwood_dma_hw_params,
.hw_free = kirkwood_dma_hw_free,
.prepare = kirkwood_dma_prepare,
.pointer = kirkwood_dma_pointer,
};
static int kirkwood_dma_preallocate_dma_buffer(struct snd_pcm *pcm, static int kirkwood_dma_preallocate_dma_buffer(struct snd_pcm *pcm,
int stream) int stream)
{ {
...@@ -267,7 +263,8 @@ static int kirkwood_dma_preallocate_dma_buffer(struct snd_pcm *pcm, ...@@ -267,7 +263,8 @@ static int kirkwood_dma_preallocate_dma_buffer(struct snd_pcm *pcm,
return 0; return 0;
} }
static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd) static int kirkwood_dma_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;
...@@ -294,7 +291,8 @@ static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd) ...@@ -294,7 +291,8 @@ static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static void kirkwood_dma_free_dma_buffers(struct snd_pcm *pcm) static void kirkwood_dma_free_dma_buffers(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;
...@@ -316,7 +314,13 @@ static void kirkwood_dma_free_dma_buffers(struct snd_pcm *pcm) ...@@ -316,7 +314,13 @@ static void kirkwood_dma_free_dma_buffers(struct snd_pcm *pcm)
const struct snd_soc_component_driver kirkwood_soc_component = { const struct snd_soc_component_driver kirkwood_soc_component = {
.name = DRV_NAME, .name = DRV_NAME,
.ops = &kirkwood_dma_ops, .open = kirkwood_dma_open,
.pcm_new = kirkwood_dma_new, .close = kirkwood_dma_close,
.pcm_free = kirkwood_dma_free_dma_buffers, .ioctl = snd_soc_pcm_lib_ioctl,
.hw_params = kirkwood_dma_hw_params,
.hw_free = kirkwood_dma_hw_free,
.prepare = kirkwood_dma_prepare,
.pointer = kirkwood_dma_pointer,
.pcm_construct = kirkwood_dma_new,
.pcm_destruct = kirkwood_dma_free_dma_buffers,
}; };
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