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

index 0945c51df003df37f415b4cbf9d9076826f1c7b6..2c5941f3a23405c091ff09bccb9fd2be4a69989d 100644 (file)
@@ -320,8 +320,10 @@ static int stac9766_codec_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
-       .controls = stac9766_snd_ac97_controls,
-       .num_controls = ARRAY_SIZE(stac9766_snd_ac97_controls),
+       .component_driver = {
+               .controls               = stac9766_snd_ac97_controls,
+               .num_controls           = ARRAY_SIZE(stac9766_snd_ac97_controls),
+       },
        .write = stac9766_ac97_write,
        .read = stac9766_ac97_read,
        .set_bias_level = stac9766_set_bias_level,