[alsa-devel] ASoC updates for 2.6.33

Takashi Iwai tiwai at suse.de
Sat Nov 7 10:24:11 CET 2009


At Fri, 6 Nov 2009 15:59:05 +0000,
Mark Brown wrote:
> 
> The following changes since commit b3f5a272a33ef06a37cd44703c46ec916b8a1c93:
>   Peter Ujfalusi (1):
>         ASoC: TWL4030: Make sure, that the codec is powered on startup
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.33

Thanks, pulled now (also for 2-6.32 branch, too).

With this pull, I got compile warnings regarding unused labels.
So I applied the patch below to topic/asoc branch.


thanks,

Takashi

---
From 4cae37fa98f4d50778161ec033122444e3c10a01 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Sat, 7 Nov 2009 10:18:22 +0100
Subject: [PATCH] ASoC: Remove dead code and labels

Remove the dead code and labels "card_err" in the error paths of
some codec drivers.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/soc/codecs/ad1836.c  |    5 -----
 sound/soc/codecs/ad1938.c  |    5 -----
 sound/soc/codecs/cx20442.c |    5 -----
 sound/soc/codecs/wm8400.c  |    5 -----
 sound/soc/codecs/wm8900.c  |    5 -----
 5 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 2e360c2..b4be96d 100644
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -387,11 +387,6 @@ static int ad1836_probe(struct platform_device *pdev)
 	snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
 	snd_soc_dapm_new_widgets(codec);
 
-	return ret;
-
-card_err:
-	snd_soc_free_pcms(socdev);
-	snd_soc_dapm_free(socdev);
 pcm_err:
 	return ret;
 }
diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c
index 09c008a..3b2222a 100644
--- a/sound/soc/codecs/ad1938.c
+++ b/sound/soc/codecs/ad1938.c
@@ -596,11 +596,6 @@ static int ad1938_probe(struct platform_device *pdev)
 
 	ad1938_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-	return ret;
-
-card_err:
-	snd_soc_free_pcms(socdev);
-	snd_soc_dapm_free(socdev);
 pcm_err:
 	return ret;
 }
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index d7f9bf1..dda751c 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -355,11 +355,6 @@ static int cx20442_codec_probe(struct platform_device *pdev)
 
 	cx20442_add_widgets(codec);
 
-	return ret;
-
-card_err:
-	snd_soc_free_pcms(socdev);
-	snd_soc_dapm_free(socdev);
 pcm_err:
 	return ret;
 }
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 0e30997..584af68 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1400,11 +1400,6 @@ static int wm8400_probe(struct platform_device *pdev)
 	wm8400_add_controls(codec);
 	wm8400_add_widgets(codec);
 
-	return ret;
-
-card_err:
-	snd_soc_free_pcms(socdev);
-	snd_soc_dapm_free(socdev);
 pcm_err:
 	return ret;
 }
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 0d185cb..85f67db 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1353,11 +1353,6 @@ static int wm8900_probe(struct platform_device *pdev)
 				ARRAY_SIZE(wm8900_snd_controls));
 	wm8900_add_widgets(codec);
 
-	return ret;
-
-card_err:
-	snd_soc_free_pcms(socdev);
-	snd_soc_dapm_free(socdev);
 pcm_err:
 	return ret;
 }
-- 
1.6.4.2



More information about the Alsa-devel mailing list