diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 08:56:24 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-08 11:57:57 +0100 |
commit | 97bf5f33475c1d2db8a5173883acacb961f45563 (patch) | |
tree | 3bae1dc615ab7144ed0bb74613155b3ea8ec22af /sound/soc/codecs | |
parent | e5538659c81991b9074ccb842e8af901c908b79b (diff) | |
download | op-kernel-dev-97bf5f33475c1d2db8a5173883acacb961f45563.zip op-kernel-dev-97bf5f33475c1d2db8a5173883acacb961f45563.tar.gz |
ASoC: codec duplicated callback function goes to component on sti-sas
codec driver and component driver has duplicated callback functions,
and codec side functions are just copied to component side when
register timing. This was quick-hack, but no longer needed.
This patch moves these functions from codec driver to component driver.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/sti-sas.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c index 160d61a..7b31ee9 100644 --- a/sound/soc/codecs/sti-sas.c +++ b/sound/soc/codecs/sti-sas.c @@ -591,11 +591,11 @@ static int sti_sas_driver_probe(struct platform_device *pdev) sti_sas_dai[STI_SAS_DAI_ANALOG_OUT].ops = drvdata->dev_data->dac_ops; /* Set dapms*/ - sti_sas_driver.dapm_widgets = drvdata->dev_data->dapm_widgets; - sti_sas_driver.num_dapm_widgets = drvdata->dev_data->num_dapm_widgets; + sti_sas_driver.component_driver.dapm_widgets = drvdata->dev_data->dapm_widgets; + sti_sas_driver.component_driver.num_dapm_widgets = drvdata->dev_data->num_dapm_widgets; - sti_sas_driver.dapm_routes = drvdata->dev_data->dapm_routes; - sti_sas_driver.num_dapm_routes = drvdata->dev_data->num_dapm_routes; + sti_sas_driver.component_driver.dapm_routes = drvdata->dev_data->dapm_routes; + sti_sas_driver.component_driver.num_dapm_routes = drvdata->dev_data->num_dapm_routes; /* Store context */ dev_set_drvdata(&pdev->dev, drvdata); |