]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: codec duplicated callback function goes to component on wm9081
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:35:15 +0000 (09:35 +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/wm9081.c

index 363b3b6676163e8c0b110efd165c5eccd7ec9e1a..30eaf4c92cd88dd100bf39ee3152c3206619dacf 100644 (file)
@@ -1282,12 +1282,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
 
        .idle_bias_off = true,
 
-       .controls         = wm9081_snd_controls,
-       .num_controls     = ARRAY_SIZE(wm9081_snd_controls),
-       .dapm_widgets     = wm9081_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets),
-       .dapm_routes     = wm9081_audio_paths,
-       .num_dapm_routes = ARRAY_SIZE(wm9081_audio_paths),
+       .component_driver = {
+               .controls               = wm9081_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm9081_snd_controls),
+               .dapm_widgets           = wm9081_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm9081_dapm_widgets),
+               .dapm_routes            = wm9081_audio_paths,
+               .num_dapm_routes        = ARRAY_SIZE(wm9081_audio_paths),
+       },
 };
 
 static const struct regmap_config wm9081_regmap = {