Skip to content

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

ASoC: sprd: sprd-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/874l0raf0c.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 21499089
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 42 deletions
sound/soc/sprd/sprd-pcm-dma.c
View file @ 6702eed8
...@@ -46,12 +46,10 @@ static const struct snd_pcm_hardware sprd_pcm_hardware = { ...@@ -46,12 +46,10 @@ static const struct snd_pcm_hardware sprd_pcm_hardware = {
.buffer_bytes_max = 64 * 1024, .buffer_bytes_max = 64 * 1024,
}; };
static int sprd_pcm_open(struct snd_pcm_substream *substream) static int sprd_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 snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct device *dev = component->dev; struct device *dev = component->dev;
struct sprd_pcm_dma_private *dma_private; struct sprd_pcm_dma_private *dma_private;
int hw_chan = SPRD_PCM_CHANNEL_MAX; int hw_chan = SPRD_PCM_CHANNEL_MAX;
...@@ -111,13 +109,11 @@ static int sprd_pcm_open(struct snd_pcm_substream *substream) ...@@ -111,13 +109,11 @@ static int sprd_pcm_open(struct snd_pcm_substream *substream)
return ret; return ret;
} }
static int sprd_pcm_close(struct snd_pcm_substream *substream) static int sprd_pcm_close(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 snd_soc_pcm_runtime *rtd = substream->private_data;
struct sprd_pcm_dma_private *dma_private = runtime->private_data; struct sprd_pcm_dma_private *dma_private = runtime->private_data;
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct device *dev = component->dev; struct device *dev = component->dev;
int size = runtime->hw.periods_max * SPRD_PCM_DMA_LINKLIST_SIZE; int size = runtime->hw.periods_max * SPRD_PCM_DMA_LINKLIST_SIZE;
int i; int i;
...@@ -157,14 +153,12 @@ static void sprd_pcm_release_dma_channel(struct snd_pcm_substream *substream) ...@@ -157,14 +153,12 @@ static void sprd_pcm_release_dma_channel(struct snd_pcm_substream *substream)
} }
} }
static int sprd_pcm_request_dma_channel(struct snd_pcm_substream *substream, static int sprd_pcm_request_dma_channel(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
int channels) int channels)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct sprd_pcm_dma_private *dma_private = runtime->private_data; struct sprd_pcm_dma_private *dma_private = runtime->private_data;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct device *dev = component->dev; struct device *dev = component->dev;
struct sprd_pcm_dma_params *dma_params = dma_private->params; struct sprd_pcm_dma_params *dma_params = dma_private->params;
int i; int i;
...@@ -190,14 +184,13 @@ static int sprd_pcm_request_dma_channel(struct snd_pcm_substream *substream, ...@@ -190,14 +184,13 @@ static int sprd_pcm_request_dma_channel(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int sprd_pcm_hw_params(struct snd_pcm_substream *substream, static int sprd_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;
struct sprd_pcm_dma_private *dma_private = runtime->private_data; struct sprd_pcm_dma_private *dma_private = runtime->private_data;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct sprd_pcm_dma_params *dma_params; struct sprd_pcm_dma_params *dma_params;
size_t totsize = params_buffer_bytes(params); size_t totsize = params_buffer_bytes(params);
size_t period = params_period_bytes(params); size_t period = params_period_bytes(params);
...@@ -218,7 +211,8 @@ static int sprd_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -218,7 +211,8 @@ static int sprd_pcm_hw_params(struct snd_pcm_substream *substream,
if (!dma_private->params) { if (!dma_private->params) {
dma_private->params = dma_params; dma_private->params = dma_params;
ret = sprd_pcm_request_dma_channel(substream, channels); ret = sprd_pcm_request_dma_channel(component,
substream, channels);
if (ret) if (ret)
return ret; return ret;
} }
...@@ -313,7 +307,8 @@ static int sprd_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -313,7 +307,8 @@ static int sprd_pcm_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
static int sprd_pcm_hw_free(struct snd_pcm_substream *substream) static int sprd_pcm_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);
sprd_pcm_release_dma_channel(substream); sprd_pcm_release_dma_channel(substream);
...@@ -321,13 +316,11 @@ static int sprd_pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -321,13 +316,11 @@ static int sprd_pcm_hw_free(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int sprd_pcm_trigger(struct snd_pcm_substream *substream, int cmd) static int sprd_pcm_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int cmd)
{ {
struct sprd_pcm_dma_private *dma_private = struct sprd_pcm_dma_private *dma_private =
substream->runtime->private_data; substream->runtime->private_data;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
int ret = 0, i; int ret = 0, i;
switch (cmd) { switch (cmd) {
...@@ -387,13 +380,11 @@ static int sprd_pcm_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -387,13 +380,11 @@ static int sprd_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
return ret; return ret;
} }
static snd_pcm_uframes_t sprd_pcm_pointer(struct snd_pcm_substream *substream) static snd_pcm_uframes_t sprd_pcm_pointer(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 snd_soc_pcm_runtime *rtd = substream->private_data;
struct sprd_pcm_dma_private *dma_private = runtime->private_data; struct sprd_pcm_dma_private *dma_private = runtime->private_data;
struct snd_soc_component *component =
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
int pointer[SPRD_PCM_CHANNEL_MAX]; int pointer[SPRD_PCM_CHANNEL_MAX];
int bytes_of_pointer = 0, sel_max = 0, i; int bytes_of_pointer = 0, sel_max = 0, i;
snd_pcm_uframes_t x; snd_pcm_uframes_t x;
...@@ -444,7 +435,8 @@ static snd_pcm_uframes_t sprd_pcm_pointer(struct snd_pcm_substream *substream) ...@@ -444,7 +435,8 @@ static snd_pcm_uframes_t sprd_pcm_pointer(struct snd_pcm_substream *substream)
return x; return x;
} }
static int sprd_pcm_mmap(struct snd_pcm_substream *substream, static int sprd_pcm_mmap(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
...@@ -456,18 +448,8 @@ static int sprd_pcm_mmap(struct snd_pcm_substream *substream, ...@@ -456,18 +448,8 @@ static int sprd_pcm_mmap(struct snd_pcm_substream *substream,
vma->vm_page_prot); vma->vm_page_prot);
} }
static struct snd_pcm_ops sprd_pcm_ops = { static int sprd_pcm_new(struct snd_soc_component *component,
.open = sprd_pcm_open, struct snd_soc_pcm_runtime *rtd)
.close = sprd_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = sprd_pcm_hw_params,
.hw_free = sprd_pcm_hw_free,
.trigger = sprd_pcm_trigger,
.pointer = sprd_pcm_pointer,
.mmap = sprd_pcm_mmap,
};
static int sprd_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;
...@@ -506,7 +488,8 @@ static int sprd_pcm_new(struct snd_soc_pcm_runtime *rtd) ...@@ -506,7 +488,8 @@ static int sprd_pcm_new(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static void sprd_pcm_free(struct snd_pcm *pcm) static void sprd_pcm_free(struct snd_soc_component *component,
struct snd_pcm *pcm)
{ {
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
int i; int i;
...@@ -523,10 +506,17 @@ static void sprd_pcm_free(struct snd_pcm *pcm) ...@@ -523,10 +506,17 @@ static void sprd_pcm_free(struct snd_pcm *pcm)
static const struct snd_soc_component_driver sprd_soc_component = { static const struct snd_soc_component_driver sprd_soc_component = {
.name = DRV_NAME, .name = DRV_NAME,
.ops = &sprd_pcm_ops, .open = sprd_pcm_open,
.close = sprd_pcm_close,
.ioctl = snd_soc_pcm_lib_ioctl,
.hw_params = sprd_pcm_hw_params,
.hw_free = sprd_pcm_hw_free,
.trigger = sprd_pcm_trigger,
.pointer = sprd_pcm_pointer,
.mmap = sprd_pcm_mmap,
.pcm_construct = sprd_pcm_new,
.pcm_destruct = sprd_pcm_free,
.compr_ops = &sprd_platform_compr_ops, .compr_ops = &sprd_platform_compr_ops,
.pcm_new = sprd_pcm_new,
.pcm_free = sprd_pcm_free,
}; };
static int sprd_soc_platform_probe(struct platform_device *pdev) static int sprd_soc_platform_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