sound: fix DAPM API change in 2.6.38

Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>

3 files changed, 15 insertions, 14 deletions

diff --git a/sound/soc/codecs/ab3550.c b/sound/soc/codecs/ab3550.c
index 1b5abd2c4e2..f5acd2b07d5 100644
--- a/sound/soc/codecs/ab3550.c
+++ b/sound/soc/codecs/ab3550.c
@@ -864,12 +864,12 @@ static enum enum_widget adder_sink_translate(u8 reg)
 
 static int ab3550_add_widgets(struct snd_soc_codec *codec)
 {
-	snd_soc_dapm_new_controls(codec, ab3550_dapm_widgets,
+	snd_soc_dapm_new_controls(&codec->dapm, ab3550_dapm_widgets,
 				  ARRAY_SIZE(ab3550_dapm_widgets));
 
-	snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+	snd_soc_dapm_add_routes(&codec->dapm, intercon, ARRAY_SIZE(intercon));
 
-	snd_soc_dapm_new_widgets(codec);
+	snd_soc_dapm_new_widgets(&codec->dapm);
 	return 0;
 }
 
@@ -1133,7 +1133,7 @@ static int ab3550_codec_probe(struct snd_soc_codec *codec)
 
 static int ab3550_codec_remove(struct snd_soc_codec *codec)
 {
-	snd_soc_dapm_free(codec);
+	snd_soc_dapm_free(&codec->dapm);
 
 	return 0;
 }
diff --git a/sound/soc/codecs/ab5500.c b/sound/soc/codecs/ab5500.c
index e5f0ecce3a0..8f8fa6a4ea2 100644
--- a/sound/soc/codecs/ab5500.c
+++ b/sound/soc/codecs/ab5500.c
@@ -1052,12 +1052,12 @@ static enum enum_widget adder_sink_translate(u8 reg)
 
 static int ab5500_add_widgets(struct snd_soc_codec *codec)
 {
-	snd_soc_dapm_new_controls(codec, ab5500_dapm_widgets,
+	snd_soc_dapm_new_controls(&codec->dapm, ab5500_dapm_widgets,
 				  ARRAY_SIZE(ab5500_dapm_widgets));
 
-	snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+	snd_soc_dapm_add_routes(&codec->dapm, intercon, ARRAY_SIZE(intercon));
 
-	snd_soc_dapm_new_widgets(codec);
+	snd_soc_dapm_new_widgets(&codec->dapm);
 	return 0;
 }
 
@@ -1296,7 +1296,7 @@ static int ab5500_codec_probe(struct snd_soc_codec *codec)
 
 static int ab5500_codec_remove(struct snd_soc_codec *codec)
 {
-	snd_soc_dapm_free(codec);
+	snd_soc_dapm_free(&codec->dapm);
 	return 0;
 }
 
diff --git a/sound/soc/codecs/ab8500.c b/sound/soc/codecs/ab8500.c
index c0222d09cf2..2d2142082a7 100644
--- a/sound/soc/codecs/ab8500.c
+++ b/sound/soc/codecs/ab8500.c
@@ -1286,7 +1286,7 @@ static int ab8500_add_widgets(struct snd_soc_codec *codec)
 {
 	int ret;
 
-	ret = snd_soc_dapm_new_controls(codec, ab8500_dapm_widgets,
+	ret = snd_soc_dapm_new_controls(&codec->dapm, ab8500_dapm_widgets,
 			ARRAY_SIZE(ab8500_dapm_widgets));
 	if (ret < 0) {
 		pr_err("%s: Failed to create DAPM controls (%d).\n",
@@ -1294,7 +1294,8 @@ static int ab8500_add_widgets(struct snd_soc_codec *codec)
 		return ret;
 	}
 
-	ret = snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+	ret = snd_soc_dapm_add_routes(&codec->dapm, intercon,
+			ARRAY_SIZE(intercon));
 	if (ret < 0) {
 		pr_err("%s: Failed to add DAPM routes (%d).\n",
 			__func__, ret);
@@ -1637,11 +1638,11 @@ static int ab8500_set_bias_level(struct snd_soc_codec *codec,
 	case SND_SOC_BIAS_ON:
 		break;
 	case SND_SOC_BIAS_PREPARE:
-		if (codec->bias_level == SND_SOC_BIAS_STANDBY)
+		if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
 			enable_regulator("v-audio");
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (codec->bias_level == SND_SOC_BIAS_PREPARE) {
+		if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) {
 			set_current_state(TASK_UNINTERRUPTIBLE);
 			schedule_timeout(msecs_to_jiffies(100));
 			disable_regulator("v-audio");
@@ -1650,7 +1651,7 @@ static int ab8500_set_bias_level(struct snd_soc_codec *codec,
 	case SND_SOC_BIAS_OFF:
 		break;
 	}
-	codec->bias_level = level;
+	codec->dapm.bias_level = level;
 
 	return 0;
 }
@@ -1686,7 +1687,7 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
 static int ab8500_codec_remove(struct snd_soc_codec *codec)
 {
-	snd_soc_dapm_free(codec);
+	snd_soc_dapm_free(&codec->dapm);
 
 	return 0;
 }