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

index cdcc91282e8a15ac3d226591df88da1b45da4c99..1bb272c36ad917bdf55ba879906cc48b5892f39e 100644 (file)
@@ -1484,12 +1484,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8753 = {
        .set_bias_level = wm8753_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8753_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8753_snd_controls),
-       .dapm_widgets = wm8753_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8753_dapm_widgets),
-       .dapm_routes = wm8753_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8753_dapm_routes),
+       .component_driver = {
+               .controls               = wm8753_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8753_snd_controls),
+               .dapm_widgets           = wm8753_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8753_dapm_widgets),
+               .dapm_routes            = wm8753_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8753_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8753_of_match[] = {