Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97bf5f33 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e5538659

sound/soc/codecs/sti-sas.c

+4 −4
Original line number Diff line number Diff line
@@ -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);