Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc...

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 96a47459b3d7cb881e90b5fd83372daff07507a3..98c6e104357cbe59416f8d602a24ec63e1b68696 100644 (file)
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2343,7 +2343,6 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
 
        max98090->devtype = id->driver_data;
        i2c_set_clientdata(i2c, max98090);
-       max98090->control_data = i2c;
        max98090->pdata = i2c->dev.platform_data;
        max98090->irq = i2c->irq;
 

diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h
index 7e103f249053d3a377e81d43e146d13fcecc03f7..1a4e2334a7b21d6f581a5cf371ffe6964563f6f2 100644 (file)
--- a/sound/soc/codecs/max98090.h
+++ b/sound/soc/codecs/max98090.h
@@ -1523,7 +1523,6 @@ struct max98090_priv {
        struct regmap *regmap;
        struct snd_soc_codec *codec;
        enum max98090_type devtype;
-       void *control_data;
        struct max98090_pdata *pdata;
        unsigned int sysclk;
        unsigned int bclk;

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index ebb13906b3a0b41b4d3c20509c613378da5ae248..024dafc3e2981b752c6d9526a35644f984076f61 100644 (file)
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -203,8 +203,7 @@ static const struct snd_soc_dapm_route dmic_audio_map[] = {
 
 static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_codec *codec = rtd->codec;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
+       struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
 
        return snd_soc_dapm_add_routes(dapm, dmic_audio_map,
                                ARRAY_SIZE(dmic_audio_map));