ASoC: Samsung: Rename from s3c24xx to samsung

[deliverable/linux.git] / sound / soc / codecs / alc5623.c

diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index fac61744f8c78bb8d31a10320c528a3a72edcd3b..9783e7e2eb93ae1612da71a99a53537e861a6c8e 100644 (file)
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -28,7 +28,6 @@
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/alc5623.h>
 
@@ -832,7 +831,7 @@ static int alc5623_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, ALC5623_PWR_MANAG_ADD1, 0);
                break;
        }
-       codec->bias_level = level;
+       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -888,10 +887,10 @@ static int alc5623_resume(struct snd_soc_codec *codec)
        alc5623_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
        /* charge alc5623 caps */
-       if (codec->suspend_bias_level == SND_SOC_BIAS_ON) {
+       if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) {
                alc5623_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-               codec->bias_level = SND_SOC_BIAS_ON;
-               alc5623_set_bias_level(codec, codec->bias_level);
+               codec->dapm.bias_level = SND_SOC_BIAS_ON;
+               alc5623_set_bias_level(codec, codec->dapm.bias_level);
        }
 
        return 0;
@@ -900,6 +899,7 @@ static int alc5623_resume(struct snd_soc_codec *codec)
 static int alc5623_probe(struct snd_soc_codec *codec)
 {
        struct alc5623_priv *alc5623 = snd_soc_codec_get_drvdata(codec);
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
        int ret;
 
        ret = snd_soc_codec_set_cache_io(codec, 8, 16, alc5623->control_type);
@@ -943,24 +943,24 @@ static int alc5623_probe(struct snd_soc_codec *codec)
        snd_soc_add_controls(codec, alc5623_snd_controls,
                        ARRAY_SIZE(alc5623_snd_controls));
 
-       snd_soc_dapm_new_controls(codec, alc5623_dapm_widgets,
+       snd_soc_dapm_new_controls(dapm, alc5623_dapm_widgets,
                                        ARRAY_SIZE(alc5623_dapm_widgets));
 
        /* set up audio path interconnects */
-       snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+       snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
        switch (alc5623->id) {
        default:
        case 0x21:
        case 0x22:
-               snd_soc_dapm_new_controls(codec, alc5623_dapm_amp_widgets,
+               snd_soc_dapm_new_controls(dapm, alc5623_dapm_amp_widgets,
                                        ARRAY_SIZE(alc5623_dapm_amp_widgets));
-               snd_soc_dapm_add_routes(codec, intercon_amp_spk,
-                                               ARRAY_SIZE(intercon_amp_spk));
+               snd_soc_dapm_add_routes(dapm, intercon_amp_spk,
+                                       ARRAY_SIZE(intercon_amp_spk));
                break;
        case 0x23:
-               snd_soc_dapm_add_routes(codec, intercon_spk,
-                                               ARRAY_SIZE(intercon_spk));
+               snd_soc_dapm_add_routes(dapm, intercon_spk,
+                                       ARRAY_SIZE(intercon_spk));
                break;
        }
 
@@ -1022,10 +1022,8 @@ static int alc5623_i2c_probe(struct i2c_client *client,
        dev_dbg(&client->dev, "Found codec id : alc56%02x\n", vid2);
 
        alc5623 = kzalloc(sizeof(struct alc5623_priv), GFP_KERNEL);
-       if (alc5623 == NULL) {
-               ret = -ENOMEM;
-               goto err;
-       }
+       if (alc5623 == NULL)
+               return -ENOMEM;
 
        pdata = client->dev.platform_data;
        if (pdata) {
@@ -1056,12 +1054,9 @@ static int alc5623_i2c_probe(struct i2c_client *client,
                &soc_codec_device_alc5623, &alc5623_dai, 1);
        if (ret != 0) {
                dev_err(&client->dev, "Failed to register codec: %d\n", ret);
-               goto err;
+               kfree(alc5623);
        }
 
-       return 0;
-
-err:
        return ret;
 }