]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: codec duplicated callback function goes to component on pcm179x
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 08:59:59 +0000 (08:59 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:57:57 +0000 (11:57 +0100)
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>
sound/soc/codecs/pcm179x.c

index 88fbdd184aa0a5b6d2e6e5a757738e8442a8b0d0..b813a154ddd97e1c31f79e815a938db0538531e3 100644 (file)
@@ -206,12 +206,14 @@ const struct regmap_config pcm179x_regmap_config = {
 EXPORT_SYMBOL_GPL(pcm179x_regmap_config);
 
 static struct snd_soc_codec_driver soc_codec_dev_pcm179x = {
-       .controls               = pcm179x_controls,
-       .num_controls           = ARRAY_SIZE(pcm179x_controls),
-       .dapm_widgets           = pcm179x_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(pcm179x_dapm_widgets),
-       .dapm_routes            = pcm179x_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(pcm179x_dapm_routes),
+       .component_driver = {
+               .controls               = pcm179x_controls,
+               .num_controls           = ARRAY_SIZE(pcm179x_controls),
+               .dapm_widgets           = pcm179x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(pcm179x_dapm_widgets),
+               .dapm_routes            = pcm179x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(pcm179x_dapm_routes),
+       },
 };
 
 int pcm179x_common_init(struct device *dev, struct regmap *regmap)