ASoC: codec duplicated callback function goes to component on lm49453
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:17:38 +0000 (09:17 +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/lm49453.c

index 9af5640e3446be9b8cb770193e1dbeedef355911..8d413c2677ccad5287d06a41d33c586296056985 100644 (file)
@@ -1391,12 +1391,14 @@ static struct snd_soc_dai_driver lm49453_dai[] = {
 
 static struct snd_soc_codec_driver soc_codec_dev_lm49453 = {
        .set_bias_level = lm49453_set_bias_level,
-       .controls = lm49453_snd_controls,
-       .num_controls = ARRAY_SIZE(lm49453_snd_controls),
-       .dapm_widgets = lm49453_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(lm49453_dapm_widgets),
-       .dapm_routes = lm49453_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(lm49453_audio_map),
+       .component_driver = {
+               .controls               = lm49453_snd_controls,
+               .num_controls           = ARRAY_SIZE(lm49453_snd_controls),
+               .dapm_widgets           = lm49453_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(lm49453_dapm_widgets),
+               .dapm_routes            = lm49453_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(lm49453_audio_map),
+       },
        .idle_bias_off = true,
 };