OSDN Git Service

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

index 5f56da6..2a3a41f 100644 (file)
@@ -357,8 +357,10 @@ static int atmel_pdmic_codec_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver soc_codec_dev_pdmic = {
        .probe          = atmel_pdmic_codec_probe,
-       .controls       = atmel_pdmic_snd_controls,
-       .num_controls   = ARRAY_SIZE(atmel_pdmic_snd_controls),
+       .component_driver = {
+               .controls               = atmel_pdmic_snd_controls,
+               .num_controls           = ARRAY_SIZE(atmel_pdmic_snd_controls),
+       },
 };
 
 /* codec dai component */