Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / wm8997.c

diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 6107108228b6d6df0951e70fdea14d6bf60f9dbc..004186b6bd48131932ac8fceca088548b9df9eb5 100644 (file)
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -86,7 +86,7 @@ static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_codec *codec = w->codec;
        struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
-       struct regmap *regmap = codec->control_data;
+       struct regmap *regmap = arizona->regmap;
        const struct reg_default *patch = NULL;
        int i, patch_size;
 
@@ -123,10 +123,12 @@ static const unsigned int wm8997_osr_val[] = {
 
 static const struct soc_enum wm8997_hpout_osr[] = {
        SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_1L,
-                             ARIZONA_OUT1_OSR_SHIFT, 0x7, 3,
+                             ARIZONA_OUT1_OSR_SHIFT, 0x7,
+                             ARRAY_SIZE(wm8997_osr_text),
                              wm8997_osr_text, wm8997_osr_val),
        SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_3L,
-                             ARIZONA_OUT3_OSR_SHIFT, 0x7, 3,
+                             ARIZONA_OUT3_OSR_SHIFT, 0x7,
+                             ARRAY_SIZE(wm8997_osr_text),
                              wm8997_osr_text, wm8997_osr_val),
 };
 
@@ -1051,9 +1053,7 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec)
        struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);
        int ret;
 
-       codec->control_data = priv->core.arizona->regmap;
-
-       ret = snd_soc_codec_set_cache_io(codec, 32, 16, SND_SOC_REGMAP);
+       ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap);
        if (ret != 0)
                return ret;