ASoC: fixups - build fixes

This is in -next and has been squashed. Will be not be required
for 24.10

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>

6 files changed, 6 insertions, 10 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 043e533970ac..9f6fa1ec1a4c 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -457,6 +457,7 @@ struct snd_soc_codec {
 	struct list_head list;
 	struct list_head card_list;
 	int num_dai;
+	struct delayed_work delayed_work;
 
 	/* runtime */
 	struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index aece6439aec1..eabf3c062500 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -538,10 +538,10 @@ static int da7210_probe(struct snd_soc_codec *codec)
 	/* Activate all enabled subsystem */
 	da7210_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN);
 
-	snd_soc_add_controls(da7210_codec, da7210_snd_controls,
+	snd_soc_add_controls(codec, da7210_snd_controls,
 			     ARRAY_SIZE(da7210_snd_controls));
 
-	dev_info(&pdev->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
+	dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
 
 	return 0;
 }
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 45e4c03db21b..c8f8c01bff4a 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1474,7 +1474,7 @@ static int wm8904_add_widgets(struct snd_soc_codec *codec)
 		break;
 	}
 
-	snd_soc_dapm_new_widgets(codec);
+	snd_soc_dapm_new_widgets(codec->dapm);
 	return 0;
 }
 
@@ -2384,8 +2384,7 @@ static int wm8904_probe(struct snd_soc_codec *codec)
 	default:
 		dev_err(codec->dev, "Unknown device type %d\n",
 			wm8904->devtype);
-		ret = -EINVAL;
-		goto err;
+		return -EINVAL;
 	}
 
 
@@ -2487,8 +2486,6 @@ static int wm8904_probe(struct snd_soc_codec *codec)
 
 	return 0;
 
-err_codec:
-	snd_soc_unregister_codec(codec);
 err_enable:
 	regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
 err_get:
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index c03617572516..62f595ecbc6c 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -759,7 +759,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = {
 static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
 				      const struct i2c_device_id *id)
 {
-	int ret;
 	struct wm8940_priv *wm8940;
 	int ret;
 
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index c3e04ea940b5..dce3e18fd9e7 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -988,7 +988,7 @@ static int wm8961_probe(struct snd_soc_codec *codec)
 	ret = wm8961_reset(codec);
 	if (ret < 0) {
 		dev_err(codec->dev, "Failed to issue reset\n");
-		goto err;
+		return ret;
 	}
 
 	/* Enable class W */
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index a48ec6653c01..53e86485a64f 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -1006,7 +1006,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8978 = {
 static __devinit int wm8978_i2c_probe(struct i2c_client *i2c,
 				      const struct i2c_device_id *id)
 {
-	int ret;
 	struct wm8978_priv *wm8978;
 	int ret;