ASoC: Factor out snd_soc_init_card()

snd_soc_init_card() is always called as the last part of the CODEC probe
function so we can factor it out into the core card setup rather than
have each CODEC replicate the code to do the initialiastation. This will
be required to support multiple CODECs per card.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

48 files changed, 69 insertions, 449 deletions

diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index 932299bb5d1e..69bd0acc81c8 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -117,9 +117,6 @@ static int ac97_soc_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto bus_err;
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0)
-                goto bus_err;
         return 0;
 
 bus_err:
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index c48485f2c55d..2e360c243075 100644
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -387,12 +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);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         return ret;
 
 card_err:
diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c
index 34b30efc3cb0..09c008ad1476 100644
--- a/sound/soc/codecs/ad1938.c
+++ b/sound/soc/codecs/ad1938.c
@@ -596,12 +596,6 @@ static int ad1938_probe(struct platform_device *pdev)
 
         ad1938_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         return ret;
 
 card_err:
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index d7440a982d22..39c0f7584e65 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -257,11 +257,6 @@ static int ad1980_soc_probe(struct platform_device *pdev)
 
         snd_soc_add_controls(codec, ad1980_snd_ac97_controls,
                                 ARRAY_SIZE(ad1980_snd_ac97_controls));
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "ad1980: failed to register card\n");
-                goto reset_err;
-        }
 
         return 0;
 
diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c
index e61dac5e7b8f..d2fcc601722c 100644
--- a/sound/soc/codecs/ad73311.c
+++ b/sound/soc/codecs/ad73311.c
@@ -64,16 +64,8 @@ static int ad73311_soc_probe(struct platform_device *pdev)
                 goto pcm_err;
         }
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "ad73311: failed to register card\n");
-                goto register_err;
-        }
-
         return ret;
 
-register_err:
-        snd_soc_free_pcms(socdev);
 pcm_err:
         kfree(socdev->card->codec);
         socdev->card->codec = NULL;
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index 4d47bc4f7428..3a14c6fc4f5e 100644
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -313,14 +313,6 @@ static int ak4104_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        /* Register the socdev */
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card\n");
-                snd_soc_free_pcms(socdev);
-                return ret;
-        }
-
         return 0;
 }
 
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 0abec0d29a96..57a6846a9a1f 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -485,17 +485,9 @@ static int ak4535_init(struct snd_soc_device *socdev)
         snd_soc_add_controls(codec, ak4535_snd_controls,
                                 ARRAY_SIZE(ak4535_snd_controls));
         ak4535_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "ak4535: failed to register card\n");
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         kfree(codec->reg_cache);
 
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index e057c7b578df..b69861d52161 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -442,18 +442,9 @@ static int ak4642_probe(struct platform_device *pdev)
                 goto pcm_err;
         }
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "ak4642: failed to register card\n");
-                goto card_err;
-        }
-
         dev_info(&pdev->dev, "AK4642 Audio Codec %s", AK4642_VERSION);
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index b61214d1c5de..364832ccd748 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -662,19 +662,10 @@ static int ak4671_probe(struct platform_device *pdev)
                              ARRAY_SIZE(ak4671_snd_controls));
         ak4671_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         ak4671_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/cs4270.c b/sound/soc/codecs/cs4270.c
index 565842dcfc65..ffe122d1cd76 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -599,13 +599,6 @@ static int cs4270_probe(struct platform_device *pdev)
                 goto error_free_pcms;
         }
 
-        /* And finally, register the socdev */
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card\n");
-                goto error_free_pcms;
-        }
-
         return 0;
 
 error_free_pcms:
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index 38eac9c866e1..d7f9bf18b72e 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -355,12 +355,6 @@ static int cx20442_codec_probe(struct platform_device *pdev)
 
         cx20442_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to register card\n");
-                goto card_err;
-        }
-
         return ret;
 
 card_err:
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 5cda9e6b5a74..2afcd0a8669d 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -90,13 +90,6 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
                 goto pcm_err;
         }
 
-        /* Register Card. */
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "pcm3008: failed to register card\n");
-                goto card_err;
-        }
-
         /* DEM1  DEM0  DE-EMPHASIS_MODE
          * Low   Low   De-emphasis 44.1 kHz ON
          * Low   High  De-emphasis OFF
@@ -136,8 +129,6 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
 
 gpio_err:
         pcm3008_gpio_free(setup);
-card_err:
-        snd_soc_free_pcms(socdev);
 pcm_err:
         kfree(socdev->card->codec);
 
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index c550750c79c0..b3130339d29a 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -613,17 +613,9 @@ static int ssm2602_init(struct snd_soc_device *socdev)
         snd_soc_add_controls(codec, ssm2602_snd_controls,
                                 ARRAY_SIZE(ssm2602_snd_controls));
         ssm2602_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                pr_err("ssm2602: failed to register card\n");
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index befc6488c39a..bbc72c2ddfca 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -418,9 +418,6 @@ static int stac9766_codec_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, stac9766_snd_ac97_controls,
                              ARRAY_SIZE(stac9766_snd_ac97_controls));
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0)
-                goto reset_err;
         return 0;
 
 reset_err:
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 0b8dcb5cd729..ee8cb2c08b87 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -707,17 +707,9 @@ static int tlv320aic23_init(struct snd_soc_device *socdev)
         snd_soc_add_controls(codec, tlv320aic23_snd_controls,
                                 ARRAY_SIZE(tlv320aic23_snd_controls));
         tlv320aic23_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "tlv320aic23: failed to register card\n");
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 3387d9e736ea..357b609196e3 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -356,18 +356,7 @@ static int aic26_probe(struct platform_device *pdev)
                         ARRAY_SIZE(aic26_snd_controls));
         WARN_ON(err < 0);
 
-        /* CODEC is setup, we can register the card now */
-        dev_dbg(&pdev->dev, "Registering card\n");
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "aic26: failed to register card\n");
-                goto card_err;
-        }
         return 0;
-
- card_err:
-        snd_soc_free_pcms(socdev);
-        return ret;
 }
 
 static int aic26_remove(struct platform_device *pdev)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 3395cf945d56..03cad250f58d 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1405,18 +1405,8 @@ static int aic3x_probe(struct platform_device *pdev)
 
         aic3x_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "aic3x: failed to register card\n");
-                goto card_err;
-        }
-
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
 pcm_err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 3ca8934fc26c..bff476d65d05 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -960,16 +960,8 @@ static int dac33_soc_probe(struct platform_device *pdev)
         /* power on device */
         dac33_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card\n");
-                goto card_err;
-        }
-
         return 0;
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
+
 pcm_err:
         dac33_hard_power(codec, 0);
         return ret;
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index c0b47dfc3328..928257b25111 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -2155,19 +2155,7 @@ static int twl4030_soc_probe(struct platform_device *pdev)
                                 ARRAY_SIZE(twl4030_snd_controls));
         twl4030_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to register card\n");
-                goto card_err;
-        }
-
         return 0;
-
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
-        return ret;
 }
 
 static int twl4030_soc_remove(struct platform_device *pdev)
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index c33b92edbded..aa40d985138f 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -562,17 +562,8 @@ static int uda134x_soc_probe(struct platform_device *pdev)
                 goto pcm_err;
         }
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "UDA134X: failed to register card\n");
-                goto card_err;
-        }
-
         return 0;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         kfree(codec->reg_cache);
 reg_err:
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 92ec03442154..a42e47d94630 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -713,17 +713,9 @@ static int uda1380_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, uda1380_snd_controls,
                                 ARRAY_SIZE(uda1380_snd_controls));
         uda1380_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 714114b50d18..2e35a354b166 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1501,18 +1501,7 @@ static int wm8350_probe(struct platform_device *pdev)
 
         wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to register card\n");
-                goto card_err;
-        }
-
         return 0;
-
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-        return ret;
 }
 
 static int wm8350_remove(struct platform_device *pdev)
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index bd7eecba20fe..0e30997c8db0 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1400,12 +1400,6 @@ static int wm8400_probe(struct platform_device *pdev)
         wm8400_add_controls(codec);
         wm8400_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to register card\n");
-                goto card_err;
-        }
-
         return ret;
 
 card_err:
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 5702435af81b..e3c21ebcc08e 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -604,16 +604,9 @@ static int wm8510_init(struct snd_soc_device *socdev,
         snd_soc_add_controls(codec, wm8510_snd_controls,
                                 ARRAY_SIZE(wm8510_snd_controls));
         wm8510_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8510: failed to register card\n");
-                goto card_err;
-        }
+
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 268cab21c2cc..2e2b01d6c82b 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -448,17 +448,9 @@ static int wm8523_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8523_snd_controls,
                              ARRAY_SIZE(wm8523_snd_controls));
         wm8523_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index a09b23e03664..dde50d118181 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -800,17 +800,9 @@ static int wm8580_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8580_snd_controls,
                              ARRAY_SIZE(wm8580_snd_controls));
         wm8580_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 54189fbf9e93..70e0675b5d4a 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -404,17 +404,9 @@ static int wm8711_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8711_snd_controls,
                              ARRAY_SIZE(wm8711_snd_controls));
         wm8711_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c
index 7df5a17eb733..d8ffbd641d71 100644
--- a/sound/soc/codecs/wm8727.c
+++ b/sound/soc/codecs/wm8727.c
@@ -68,17 +68,9 @@ static int wm8727_soc_probe(struct platform_device *pdev)
                 printk(KERN_ERR "wm8727: failed to create pcms\n");
                 goto pcm_err;
         }
-        /* register card */
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8727: failed to register card\n");
-                goto register_err;
-        }
 
         return ret;
 
-register_err:
-        snd_soc_free_pcms(socdev);
 pcm_err:
         kfree(socdev->card->codec);
         socdev->card->codec = NULL;
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 16e969a762c3..1252a8a486a6 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -287,17 +287,9 @@ static int wm8728_init(struct snd_soc_device *socdev,
         snd_soc_add_controls(codec, wm8728_snd_controls,
                                 ARRAY_SIZE(wm8728_snd_controls));
         wm8728_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8728: failed to register card\n");
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index bb95af950971..e3675e7a9813 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -495,17 +495,9 @@ static int wm8731_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8731_snd_controls,
                              ARRAY_SIZE(wm8731_snd_controls));
         wm8731_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 4ba1e7e93fb4..50a3d6590588 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -772,16 +772,8 @@ static int wm8750_init(struct snd_soc_device *socdev,
         snd_soc_add_controls(codec, wm8750_snd_controls,
                                 ARRAY_SIZE(wm8750_snd_controls));
         wm8750_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8750: failed to register card\n");
-                goto card_err;
-        }
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 8f7305257d29..c652bc04cc81 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1583,18 +1583,9 @@ static int wm8753_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8753_snd_controls,
                              ARRAY_SIZE(wm8753_snd_controls));
         wm8753_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8753: failed to register card\n");
-                goto card_err;
-        }
 
         return 0;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index a0bbb28eed75..ab2c0da18091 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -447,17 +447,8 @@ static int wm8776_probe(struct platform_device *pdev)
                                   ARRAY_SIZE(wm8776_dapm_widgets));
         snd_soc_dapm_add_routes(codec, routes, ARRAY_SIZE(routes));
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         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 b48804b5cacd..0d185cb6418d 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1353,12 +1353,6 @@ static int wm8900_probe(struct platform_device *pdev)
                                 ARRAY_SIZE(wm8900_snd_controls));
         wm8900_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "Failed to register card\n");
-                goto card_err;
-        }
-
         return ret;
 
 card_err:
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 94cdb8130415..bfeff4ee5de9 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1695,17 +1695,8 @@ static int wm8903_probe(struct platform_device *pdev)
                                 ARRAY_SIZE(wm8903_snd_controls));
         wm8903_add_widgets(socdev->card->codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "wm8903: failed to register card\n");
-                goto card_err;
-        }
-
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 8d4fd3c08c09..fc80aa6c913c 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -731,12 +731,6 @@ static int wm8940_probe(struct platform_device *pdev)
         if (ret)
                 goto error_free_pcms;
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto error_free_pcms;
-        }
-
         return ret;
 
 error_free_pcms:
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index b9b096a85396..40390afa75f3 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -713,17 +713,9 @@ static int wm8960_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8960_snd_controls,
                              ARRAY_SIZE(wm8960_snd_controls));
         wm8960_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index b5c6f2cd5ae2..07e389574db1 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -988,17 +988,8 @@ static int wm8961_probe(struct platform_device *pdev)
         snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
         snd_soc_dapm_new_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index d66efb0546ea..56a66e89ab91 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -703,16 +703,9 @@ static int wm8971_init(struct snd_soc_device *socdev,
         snd_soc_add_controls(codec, wm8971_snd_controls,
                                 ARRAY_SIZE(wm8971_snd_controls));
         wm8971_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8971: failed to register card\n");
-                goto card_err;
-        }
+
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index eff29331235b..c245f0ee0ec2 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -641,17 +641,9 @@ static int wm8974_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm8974_snd_controls,
                              ARRAY_SIZE(wm8974_snd_controls));
         wm8974_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
 
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index d8d8f68b81ea..bee292e37d1b 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -792,17 +792,8 @@ static int wm8988_probe(struct platform_device *pdev)
         snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
         snd_soc_dapm_new_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index f657e9a5fe26..e43cb2c8b915 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1409,16 +1409,9 @@ static int wm8990_init(struct snd_soc_device *socdev)
         snd_soc_add_controls(codec, wm8990_snd_controls,
                                 ARRAY_SIZE(wm8990_snd_controls));
         wm8990_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm8990: failed to register card\n");
-                goto card_err;
-        }
+
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         kfree(codec->reg_cache);
         return ret;
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index dac397712147..0d4d2be92b64 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1466,17 +1466,8 @@ static int wm8993_probe(struct platform_device *pdev)
 
         snd_soc_dapm_new_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card\n");
-                goto card_err;
-        }
-
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 4cb6b104b729..3f1f84421312 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1264,17 +1264,8 @@ static int wm9081_probe(struct platform_device *pdev)
         snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
         snd_soc_dapm_new_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                dev_err(codec->dev, "failed to register card: %d\n", ret);
-                goto card_err;
-        }
-
         return ret;
 
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
 pcm_err:
         return ret;
 }
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index e7d2840d9e59..0e817b8705cd 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -403,16 +403,8 @@ static int wm9705_soc_probe(struct platform_device *pdev)
                                 ARRAY_SIZE(wm9705_snd_ac97_controls));
         wm9705_add_widgets(codec);
 
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm9705: failed to register card\n");
-                goto reset_err;
-        }
-
         return 0;
 
-reset_err:
-        snd_soc_free_pcms(socdev);
 pcm_err:
         snd_soc_free_ac97_codec(codec);
 codec_err:
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 1fd4e88f50cf..155cacf124ea 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -695,17 +695,9 @@ static int wm9712_soc_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm9712_snd_ac97_controls,
                                 ARRAY_SIZE(wm9712_snd_ac97_controls));
         wm9712_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0) {
-                printk(KERN_ERR "wm9712: failed to register card\n");
-                goto reset_err;
-        }
 
         return 0;
 
-reset_err:
-        snd_soc_free_pcms(socdev);
-
 pcm_err:
         snd_soc_free_ac97_codec(codec);
 
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index ca3d449ed89e..5f81ecd20a81 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1247,13 +1247,8 @@ static int wm9713_soc_probe(struct platform_device *pdev)
         snd_soc_add_controls(codec, wm9713_snd_ac97_controls,
                                 ARRAY_SIZE(wm9713_snd_ac97_controls));
         wm9713_add_widgets(codec);
-        ret = snd_soc_init_card(socdev);
-        if (ret < 0)
-                goto reset_err;
-        return 0;
 
-reset_err:
-        snd_soc_free_pcms(socdev);
+        return 0;
 
 pcm_err:
         snd_soc_free_ac97_codec(codec);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d81a16187769..e2b6d75f16e3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -970,6 +970,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
                                                     struct platform_device,
                                                     dev);
         struct snd_soc_codec_device *codec_dev = card->socdev->codec_dev;
+        struct snd_soc_codec *codec;
         struct snd_soc_platform *platform;
         struct snd_soc_dai *dai;
         int i, found, ret, ac97;
@@ -1058,6 +1059,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
                 if (ret < 0)
                         goto cpu_dai_err;
         }
+        codec = card->codec;
 
         if (platform->probe) {
                 ret = platform->probe(pdev);
@@ -1072,10 +1074,72 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
         INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
 #endif
 
+        for (i = 0; i < card->num_links; i++) {
+                if (card->dai_link[i].init) {
+                        ret = card->dai_link[i].init(codec);
+                        if (ret < 0) {
+                                printk(KERN_ERR "asoc: failed to init %s\n",
+                                        card->dai_link[i].stream_name);
+                                continue;
+                        }
+                }
+                if (card->dai_link[i].codec_dai->ac97_control) {
+                        ac97 = 1;
+                        snd_ac97_dev_add_pdata(codec->ac97,
+                                card->dai_link[i].cpu_dai->ac97_pdata);
+                }
+        }
+
+        snprintf(codec->card->shortname, sizeof(codec->card->shortname),
+                 "%s",  card->name);
+        snprintf(codec->card->longname, sizeof(codec->card->longname),
+                 "%s (%s)", card->name, codec->name);
+
+        /* Make sure all DAPM widgets are instantiated */
+        snd_soc_dapm_new_widgets(codec);
+
+        ret = snd_card_register(codec->card);
+        if (ret < 0) {
+                printk(KERN_ERR "asoc: failed to register soundcard for %s\n",
+                                codec->name);
+                goto card_err;
+        }
+
+        mutex_lock(&codec->mutex);
+#ifdef CONFIG_SND_SOC_AC97_BUS
+        /* Only instantiate AC97 if not already done by the adaptor
+         * for the generic AC97 subsystem.
+         */
+        if (ac97 && strcmp(codec->name, "AC97") != 0) {
+                ret = soc_ac97_dev_register(codec);
+                if (ret < 0) {
+                        printk(KERN_ERR "asoc: AC97 device register failed\n");
+                        snd_card_free(codec->card);
+                        mutex_unlock(&codec->mutex);
+                        goto card_err;
+                }
+        }
+#endif
+
+        ret = snd_soc_dapm_sys_add(card->socdev->dev);
+        if (ret < 0)
+                printk(KERN_WARNING "asoc: failed to add dapm sysfs entries\n");
+
+        ret = device_create_file(card->socdev->dev, &dev_attr_codec_reg);
+        if (ret < 0)
+                printk(KERN_WARNING "asoc: failed to add codec sysfs files\n");
+
+        soc_init_codec_debugfs(codec);
+        mutex_unlock(&codec->mutex);
+
         card->instantiated = 1;
 
         return;
 
+card_err:
+        if (platform->remove)
+                platform->remove(pdev);
+
 platform_err:
         if (codec_dev->remove)
                 codec_dev->remove(pdev);
@@ -1454,83 +1518,6 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
 EXPORT_SYMBOL_GPL(snd_soc_new_pcms);
 
 /**
- * snd_soc_init_card - register sound card
- * @socdev: the SoC audio device
- *
- * Register a SoC sound card. Also registers an AC97 device if the
- * codec is AC97 for ad hoc devices.
- *
- * Returns 0 for success, else error.
- */
-int snd_soc_init_card(struct snd_soc_device *socdev)
-{
-        struct snd_soc_card *card = socdev->card;
-        struct snd_soc_codec *codec = card->codec;
-        int ret = 0, i, ac97 = 0, err = 0;
-
-        for (i = 0; i < card->num_links; i++) {
-                if (card->dai_link[i].init) {
-                        err = card->dai_link[i].init(codec);
-                        if (err < 0) {
-                                printk(KERN_ERR "asoc: failed to init %s\n",
-                                        card->dai_link[i].stream_name);
-                                continue;
-                        }
-                }
-                if (card->dai_link[i].codec_dai->ac97_control) {
-                        ac97 = 1;
-                        snd_ac97_dev_add_pdata(codec->ac97,
-                                card->dai_link[i].cpu_dai->ac97_pdata);
-                }
-        }
-        snprintf(codec->card->shortname, sizeof(codec->card->shortname),
-                 "%s",  card->name);
-        snprintf(codec->card->longname, sizeof(codec->card->longname),
-                 "%s (%s)", card->name, codec->name);
-
-        /* Make sure all DAPM widgets are instantiated */
-        snd_soc_dapm_new_widgets(codec);
-
-        ret = snd_card_register(codec->card);
-        if (ret < 0) {
-                printk(KERN_ERR "asoc: failed to register soundcard for %s\n",
-                                codec->name);
-                goto out;
-        }
-
-        mutex_lock(&codec->mutex);
-#ifdef CONFIG_SND_SOC_AC97_BUS
-        /* Only instantiate AC97 if not already done by the adaptor
-         * for the generic AC97 subsystem.
-         */
-        if (ac97 && strcmp(codec->name, "AC97") != 0) {
-                ret = soc_ac97_dev_register(codec);
-                if (ret < 0) {
-                        printk(KERN_ERR "asoc: AC97 device register failed\n");
-                        snd_card_free(codec->card);
-                        mutex_unlock(&codec->mutex);
-                        goto out;
-                }
-        }
-#endif
-
-        err = snd_soc_dapm_sys_add(socdev->dev);
-        if (err < 0)
-                printk(KERN_WARNING "asoc: failed to add dapm sysfs entries\n");
-
-        err = device_create_file(socdev->dev, &dev_attr_codec_reg);
-        if (err < 0)
-                printk(KERN_WARNING "asoc: failed to add codec sysfs files\n");
-
-        soc_init_codec_debugfs(codec);
-        mutex_unlock(&codec->mutex);
-
-out:
-        return ret;
-}
-EXPORT_SYMBOL_GPL(snd_soc_init_card);
-
-/**
  * snd_soc_free_pcms - free sound card and pcms
  * @socdev: the SoC audio device
  *