Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (430 commits)
  ALSA: hda - Add quirk for Acer Ferrari 5000
  ALSA: hda - Use cached calls to get widget caps and pin caps
  ALSA: hda - Don't create empty/single-item input source
  ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c
  ALSA: hda - Cache pin-cap values
  ALSA: hda - Avoid output amp manipulation to digital mic pins
  ALSA: hda - Add function id to proc output
  ALSA: pcm - Safer boundary checks
  ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272
  ALSA: sound/ali5451: typo: s/resouces/resources/
  ALSA: hda - Don't show the current connection for power widgets
  ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c
  ASoC: Declare Headset as Mic and Headphone widgets for SDP3430
  ASoC: OMAP: N810: Add more jack functions
  ASoC: OMAP: N810: Mark not connected input pins
  ASoC: Add FLL support for WM8400
  ALSA: hda - Don't reset stream at each prepare callback
  ALSA: hda - Don't reset BDL unnecessarily
  ALSA: pcm - Fix delta calculation at boundary overlap
  ALSA: pcm - Reset invalid position even without debug option
  ...

1 files changed, 34 insertions, 50 deletions

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index a2c5064a774b..ddefb8f80145 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -173,7 +173,7 @@ static int uda134x_startup(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct uda134x_priv *uda134x = codec->private_data;
         struct snd_pcm_runtime *master_runtime;
 
@@ -206,7 +206,7 @@ static void uda134x_shutdown(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct uda134x_priv *uda134x = codec->private_data;
 
         if (uda134x->master_substream == substream)
@@ -221,7 +221,7 @@ static int uda134x_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct uda134x_priv *uda134x = codec->private_data;
         u8 hw_params;
 
@@ -431,38 +431,14 @@ SOC_ENUM("PCM Playback De-emphasis", uda134x_mixer_enum[1]),
 SOC_SINGLE("DC Filter Enable Switch", UDA134X_STATUS0, 0, 1, 0),
 };
 
-static int uda134x_add_controls(struct snd_soc_codec *codec)
-{
-        int err, i, n;
-        const struct snd_kcontrol_new *ctrls;
-        struct uda134x_platform_data *pd = codec->control_data;
-
-        switch (pd->model) {
-        case UDA134X_UDA1340:
-        case UDA134X_UDA1344:
-                n = ARRAY_SIZE(uda1340_snd_controls);
-                ctrls = uda1340_snd_controls;
-                break;
-        case UDA134X_UDA1341:
-                n = ARRAY_SIZE(uda1341_snd_controls);
-                ctrls = uda1341_snd_controls;
-                break;
-        default:
-                printk(KERN_ERR "%s unkown codec type: %d",
-                       __func__, pd->model);
-                return -EINVAL;
-        }
-
-        for (i = 0; i < n; i++) {
-                err = snd_ctl_add(codec->card,
-                                  snd_soc_cnew(&ctrls[i],
-                                               codec, NULL));
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
-}
+static struct snd_soc_dai_ops uda134x_dai_ops = {
+        .startup        = uda134x_startup,
+        .shutdown       = uda134x_shutdown,
+        .hw_params      = uda134x_hw_params,
+        .digital_mute   = uda134x_mute,
+        .set_sysclk     = uda134x_set_dai_sysclk,
+        .set_fmt        = uda134x_set_dai_fmt,
+};
 
 struct snd_soc_dai uda134x_dai = {
         .name = "UDA134X",
@@ -483,14 +459,7 @@ struct snd_soc_dai uda134x_dai = {
                 .formats = UDA134X_FORMATS,
         },
         /* pcm operations */
-        .ops = {
-                .startup = uda134x_startup,
-                .shutdown = uda134x_shutdown,
-                .hw_params = uda134x_hw_params,
-                .digital_mute = uda134x_mute,
-                .set_sysclk = uda134x_set_dai_sysclk,
-                .set_fmt = uda134x_set_dai_fmt,
-        }
+        .ops = &uda134x_dai_ops,
 };
 EXPORT_SYMBOL(uda134x_dai);
 
@@ -525,11 +494,11 @@ static int uda134x_soc_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (socdev->codec == NULL)
+        socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
+        if (socdev->card->codec == NULL)
                 return ret;
 
-        codec = socdev->codec;
+        codec = socdev->card->codec;
 
         uda134x = kzalloc(sizeof(struct uda134x_priv), GFP_KERNEL);
         if (uda134x == NULL)
@@ -572,7 +541,22 @@ static int uda134x_soc_probe(struct platform_device *pdev)
                 goto pcm_err;
         }
 
-        ret = uda134x_add_controls(codec);
+        switch (pd->model) {
+        case UDA134X_UDA1340:
+        case UDA134X_UDA1344:
+                ret = snd_soc_add_controls(codec, uda1340_snd_controls,
+                                        ARRAY_SIZE(uda1340_snd_controls));
+        break;
+        case UDA134X_UDA1341:
+                ret = snd_soc_add_controls(codec, uda1341_snd_controls,
+                                        ARRAY_SIZE(uda1341_snd_controls));
+        break;
+        default:
+                printk(KERN_ERR "%s unkown codec type: %d",
+                        __func__, pd->model);
+        return -EINVAL;
+        }
+
         if (ret < 0) {
                 printk(KERN_ERR "UDA134X: failed to register controls\n");
                 goto pcm_err;
@@ -602,7 +586,7 @@ priv_err:
 static int uda134x_soc_remove(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -622,7 +606,7 @@ static int uda134x_soc_suspend(struct platform_device *pdev,
                                                 pm_message_t state)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -632,7 +616,7 @@ static int uda134x_soc_suspend(struct platform_device *pdev,
 static int uda134x_soc_resume(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         uda134x_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
         uda134x_set_bias_level(codec, SND_SOC_BIAS_ON);