ASoC: Convert Simtec machines to table based DAPM init
Subsystems (3)
PATCH 1/1 ASoC: Convert Simtec machines to table based DAPM init
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/samsung/s3c24xx_simtec_hermes.c | 10 +++++----- sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)
sound/soc/samsung/s3c24xx_simtec_hermes.c +5 -5
@@ -66,11 +66,6 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)struct snd_soc_codec *codec = rtd->codec;struct snd_soc_dapm_context *dapm = &codec->dapm; -snd_soc_dapm_new_controls (dapm, dapm_widgets, -ARRAY_SIZE (dapm_widgets)); - -snd_soc_dapm_add_routes (dapm, base_map,ARRAY_SIZE (base_map)); -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" );snd_soc_dapm_enable_pin (dapm,"Line In" );snd_soc_dapm_enable_pin (dapm,"Line Out" );
@@ -97,6 +92,11 @@ static struct snd_soc_card snd_soc_machine_simtec_aic33 = { .name = "Simtec-Hermes", .dai_link = &simtec_dai_aic33, .num_links = 1, + + .dapm_widgets = dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dapm_widgets), + .dapm_routes = base_map, + .num_dapm_routes = ARRAY_SIZE(base_map), };static int __devinit simtec_audio_hermes_probe (struct platform_device *pd)
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +5 -5
@@ -55,11 +55,6 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)struct snd_soc_codec *codec = rtd->codec;struct snd_soc_dapm_context *dapm = &codec->dapm; -snd_soc_dapm_new_controls (dapm, dapm_widgets, -ARRAY_SIZE (dapm_widgets)); - -snd_soc_dapm_add_routes (dapm, base_map,ARRAY_SIZE (base_map)); -snd_soc_dapm_enable_pin (dapm,"Headphone Jack" );snd_soc_dapm_enable_pin (dapm,"Line In" );snd_soc_dapm_enable_pin (dapm,"Line Out" );
@@ -86,6 +81,11 @@ static struct snd_soc_card snd_soc_machine_simtec_aic23 = { .name = "Simtec", .dai_link = &simtec_dai_aic23, .num_links = 1, + + .dapm_widgets = dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dapm_widgets), + .dapm_routes = base_map, + .num_dapm_routes = ARRAY_SIZE(base_map), };static int __devinit simtec_audio_tlv320aic23_probe (struct platform_device *pd)
Signature · 1 line
1.7.6.3