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

ASoC: qcom: q6routing: 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/87sgob90ep.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:33:34 +09:00 committed by Mark Brown
parent 8b83c90dba
commit e198048bdc
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/qcom/qdsp6/q6routing.c
View File

@ -939,12 +939,12 @@ static const struct snd_soc_dapm_route intercon[] = {
}; };
static int routing_hw_params(struct snd_pcm_substream *substream, static int routing_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_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *c = snd_soc_rtdcom_lookup(rtd, DRV_NAME); struct msm_routing_data *data = dev_get_drvdata(component->dev);
struct msm_routing_data *data = dev_get_drvdata(c->dev);
unsigned int be_id = rtd->cpu_dai->id; unsigned int be_id = rtd->cpu_dai->id;
struct session_data *session; struct session_data *session;
int path_type; int path_type;
@ -980,10 +980,6 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static struct snd_pcm_ops q6pcm_routing_ops = {
.hw_params = routing_hw_params,
};
static int msm_routing_probe(struct snd_soc_component *c) static int msm_routing_probe(struct snd_soc_component *c)
{ {
int i; int i;
@ -997,9 +993,9 @@ static int msm_routing_probe(struct snd_soc_component *c)
} }
static const struct snd_soc_component_driver msm_soc_routing_component = { static const struct snd_soc_component_driver msm_soc_routing_component = {
.ops = &q6pcm_routing_ops,
.probe = msm_routing_probe, .probe = msm_routing_probe,
.name = DRV_NAME, .name = DRV_NAME,
.hw_params = routing_hw_params,
.dapm_widgets = msm_qdsp6_widgets, .dapm_widgets = msm_qdsp6_widgets,
.num_dapm_widgets = ARRAY_SIZE(msm_qdsp6_widgets), .num_dapm_widgets = ARRAY_SIZE(msm_qdsp6_widgets),
.dapm_routes = intercon, .dapm_routes = intercon,