diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-23 12:54:02 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-24 06:11:41 -0400 |
commit | ad65adf4a3039ecd93d4712ac6524dbd9e0e848a (patch) | |
tree | 42d10de89eedfceba4a7547b6184174b8f5825a1 | |
parent | 356d86e24850cdc353602b90be73e627f86707c7 (diff) |
ASoC: max98088: Use table based control init
Tested-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/max98088.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 391f66913a44..8896d5e33980 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) | |||
2048 | 2048 | ||
2049 | max98088_handle_pdata(codec); | 2049 | max98088_handle_pdata(codec); |
2050 | 2050 | ||
2051 | snd_soc_add_codec_controls(codec, max98088_snd_controls, | ||
2052 | ARRAY_SIZE(max98088_snd_controls)); | ||
2053 | |||
2054 | err_access: | 2051 | err_access: |
2055 | return ret; | 2052 | return ret; |
2056 | } | 2053 | } |
@@ -2071,6 +2068,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max98088 = { | |||
2071 | .suspend = max98088_suspend, | 2068 | .suspend = max98088_suspend, |
2072 | .resume = max98088_resume, | 2069 | .resume = max98088_resume, |
2073 | .set_bias_level = max98088_set_bias_level, | 2070 | .set_bias_level = max98088_set_bias_level, |
2071 | .controls = max98088_snd_controls, | ||
2072 | .num_controls = ARRAY_SIZE(max98088_snd_controls), | ||
2074 | .reg_cache_size = ARRAY_SIZE(max98088_reg), | 2073 | .reg_cache_size = ARRAY_SIZE(max98088_reg), |
2075 | .reg_word_size = sizeof(u8), | 2074 | .reg_word_size = sizeof(u8), |
2076 | .reg_cache_default = max98088_reg, | 2075 | .reg_cache_default = max98088_reg, |