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

index 4452fea0b11857b7a6d004b3b1892a50aeba246f..993bde29ca1bcc6e611bf8d7b7b1f83caa0ce396 100644 (file)
@@ -597,12 +597,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = {
        .set_bias_level = ssm2602_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = ssm260x_snd_controls,
-       .num_controls = ARRAY_SIZE(ssm260x_snd_controls),
-       .dapm_widgets = ssm260x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ssm260x_dapm_widgets),
-       .dapm_routes = ssm260x_routes,
-       .num_dapm_routes = ARRAY_SIZE(ssm260x_routes),
+       .component_driver = {
+               .controls               = ssm260x_snd_controls,
+               .num_controls           = ARRAY_SIZE(ssm260x_snd_controls),
+               .dapm_widgets           = ssm260x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ssm260x_dapm_widgets),
+               .dapm_routes            = ssm260x_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ssm260x_routes),
+       },
 };
 
 static bool ssm2602_register_volatile(struct device *dev, unsigned int reg)