From: Mark Brown <broonie@linaro.org>
Date: Mon, 23 Sep 2013 16:54:02 +0000 (+0100)
Subject: ASoC: max98088: Use table based control init
X-Git-Tag: upstream/snapshot3+hdmi~3891^2~33^2~29^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad65adf4a3039ecd93d4712ac6524dbd9e0e848a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ASoC: max98088: Use table based control init

Tested-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 391f669..8896d5e 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -2048,9 +2048,6 @@ static int max98088_probe(struct snd_soc_codec *codec)
 
        max98088_handle_pdata(codec);
 
-       snd_soc_add_codec_controls(codec, max98088_snd_controls,
-                            ARRAY_SIZE(max98088_snd_controls));
-
 err_access:
        return ret;
 }
@@ -2071,6 +2068,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max98088 = {
 	.suspend = max98088_suspend,
 	.resume  = max98088_resume,
 	.set_bias_level = max98088_set_bias_level,
+	.controls = max98088_snd_controls,
+	.num_controls = ARRAY_SIZE(max98088_snd_controls),
 	.reg_cache_size = ARRAY_SIZE(max98088_reg),
 	.reg_word_size = sizeof(u8),
 	.reg_cache_default = max98088_reg,