Răsfoiți Sursa

ASoC: codec duplicated callback function goes to component on cx20442

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>
Kuninori Morimoto 9 ani în urmă
părinte
comite
a2c9c0f972
1 a modificat fișierele cu 6 adăugiri și 4 ștergeri
  1. 6 4
      sound/soc/codecs/cx20442.c

+ 6 - 4
sound/soc/codecs/cx20442.c

@@ -407,10 +407,12 @@ static struct snd_soc_codec_driver cx20442_codec_dev = {
 	.reg_word_size = sizeof(u8),
 	.reg_word_size = sizeof(u8),
 	.read = cx20442_read_reg_cache,
 	.read = cx20442_read_reg_cache,
 	.write = cx20442_write,
 	.write = cx20442_write,
-	.dapm_widgets = cx20442_dapm_widgets,
-	.num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),
-	.dapm_routes = cx20442_audio_map,
-	.num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),
+	.component_driver = {
+		.dapm_widgets		= cx20442_dapm_widgets,
+		.num_dapm_widgets	= ARRAY_SIZE(cx20442_dapm_widgets),
+		.dapm_routes		= cx20442_audio_map,
+		.num_dapm_routes	= ARRAY_SIZE(cx20442_audio_map),
+	},
 };
 };
 
 
 static int cx20442_platform_probe(struct platform_device *pdev)
 static int cx20442_platform_probe(struct platform_device *pdev)