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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
  ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
  ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
  ALSA: usb-audio: add Yamaha MOX6/MOX8 support
  ALSA: virtuoso: add S/PDIF input support for all Xonars
  ALSA: ice1724 - Support for ooAoo SQ210a
  ALSA: ice1724 - Allow card info based on model only
  ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
  ALSA: hdspm - Provide unique driver id based on card serial
  ASoC: Dynamically allocate the rtd device for a non-empty release()
  ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
  ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
  ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
  ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
  ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
  ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
  ALSA: hda/cirrus - support for iMac12,2 model
  ASoC: cx20442: add bias control over a platform provided regulator
  ALSA: usb-audio - Avoid flood of frame-active debug messages
  ALSA: snd-usb-us122l: Delete calls to preempt_disable
  mfd: Put WM8994 into cache only mode when suspending
  ...

Fix up trivial conflicts in:
 - arch/arm/mach-s3c64xx/mach-crag6410.c:
	renamed speyside_wm8962 to tobermory, added littlemill right
	next to it
 - drivers/base/regmap/{regcache.c,regmap.c}:
	duplicate diff that had already come in with other changes in
	the regmap tree

1 files changed, 16 insertions, 25 deletions

diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 1ee66361f61b..a8bf588e8740 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -22,7 +22,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/soc.h>
@@ -175,21 +174,18 @@ static const struct snd_kcontrol_new cs42l51_snd_controls[] = {
 static int cs42l51_pdn_event(struct snd_soc_dapm_widget *w,
                 struct snd_kcontrol *kcontrol, int event)
 {
-        unsigned long value;
-
-        value = snd_soc_read(w->codec, CS42L51_POWER_CTL1);
-        value &= ~CS42L51_POWER_CTL1_PDN;
-
         switch (event) {
         case SND_SOC_DAPM_PRE_PMD:
-                value |= CS42L51_POWER_CTL1_PDN;
+                snd_soc_update_bits(w->codec, CS42L51_POWER_CTL1,
+                                    CS42L51_POWER_CTL1_PDN,
+                                    CS42L51_POWER_CTL1_PDN);
                 break;
         default:
         case SND_SOC_DAPM_POST_PMD:
+                snd_soc_update_bits(w->codec, CS42L51_POWER_CTL1,
+                                    CS42L51_POWER_CTL1_PDN, 0);
                 break;
         }
-        snd_soc_update_bits(w->codec, CS42L51_POWER_CTL1,
-                CS42L51_POWER_CTL1_PDN, value);
 
         return 0;
 }
@@ -486,7 +482,7 @@ static int cs42l51_dai_mute(struct snd_soc_dai *dai, int mute)
         return snd_soc_write(codec, CS42L51_DAC_OUT_CTL, reg);
 }
 
-static struct snd_soc_dai_ops cs42l51_dai_ops = {
+static const struct snd_soc_dai_ops cs42l51_dai_ops = {
         .hw_params      = cs42l51_hw_params,
         .set_sysclk     = cs42l51_set_dai_sysclk,
         .set_fmt        = cs42l51_set_dai_fmt,
@@ -515,7 +511,6 @@ static struct snd_soc_dai_driver cs42l51_dai = {
 static int cs42l51_probe(struct snd_soc_codec *codec)
 {
         struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec);
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret, reg;
 
         ret = cs42l51_fill_cache(codec);
@@ -543,20 +538,20 @@ static int cs42l51_probe(struct snd_soc_codec *codec)
         if (ret < 0)
                 return ret;
 
-        snd_soc_add_controls(codec, cs42l51_snd_controls,
-                ARRAY_SIZE(cs42l51_snd_controls));
-        snd_soc_dapm_new_controls(dapm, cs42l51_dapm_widgets,
-                ARRAY_SIZE(cs42l51_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, cs42l51_routes,
-                ARRAY_SIZE(cs42l51_routes));
-
         return 0;
 }
 
 static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
-        .probe =        cs42l51_probe,
+        .probe = cs42l51_probe,
         .reg_cache_size = CS42L51_NUMREGS + 1,
         .reg_word_size = sizeof(u8),
+
+        .controls = cs42l51_snd_controls,
+        .num_controls = ARRAY_SIZE(cs42l51_snd_controls),
+        .dapm_widgets = cs42l51_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(cs42l51_dapm_widgets),
+        .dapm_routes = cs42l51_routes,
+        .num_dapm_routes = ARRAY_SIZE(cs42l51_routes),
 };
 
 static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
@@ -582,7 +577,8 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
         dev_info(&i2c_client->dev, "found device cs42l51 rev %d\n",
                                 ret & 7);
 
-        cs42l51 = kzalloc(sizeof(struct cs42l51_private), GFP_KERNEL);
+        cs42l51 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l51_private),
+                               GFP_KERNEL);
         if (!cs42l51) {
                 dev_err(&i2c_client->dev, "could not allocate codec\n");
                 return -ENOMEM;
@@ -593,18 +589,13 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
 
         ret =  snd_soc_register_codec(&i2c_client->dev,
                         &soc_codec_device_cs42l51, &cs42l51_dai, 1);
-        if (ret < 0)
-                kfree(cs42l51);
 error:
         return ret;
 }
 
 static int cs42l51_i2c_remove(struct i2c_client *client)
 {
-        struct cs42l51_private *cs42l51 = i2c_get_clientdata(client);
-
         snd_soc_unregister_codec(&client->dev);
-        kfree(cs42l51);
         return 0;
 }