diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-23 19:05:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-24 19:30:25 +0100 |
| commit | c6b3283f6d8818177349eb7cc0549286a55140c7 (patch) | |
| tree | 6148b080ed9d324b2ce643a1c33b89a9b0352121 | |
| parent | d36126ac5674a83e1d426877709437b24f058f47 (diff) | |
| download | linux-stable-c6b3283f6d8818177349eb7cc0549286a55140c7.tar.gz linux-stable-c6b3283f6d8818177349eb7cc0549286a55140c7.tar.bz2 linux-stable-c6b3283f6d8818177349eb7cc0549286a55140c7.zip | |
ASoC: max90895: Convert to table based control init
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/codecs/max98095.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 65aba5ec52df..1a4585ae36e4 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -1268,14 +1268,6 @@ static const struct snd_soc_dapm_route max98095_audio_map[] = { {"MIC2 Input", NULL, "MIC2"}, }; -static int max98095_add_widgets(struct snd_soc_codec *codec) -{ - snd_soc_add_codec_controls(codec, max98095_snd_controls, - ARRAY_SIZE(max98095_snd_controls)); - - return 0; -} - /* codec mclk clock divider coefficients */ static const struct { u32 rate; @@ -2430,8 +2422,6 @@ static int max98095_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, M98095_097_PWR_SYS, M98095_SHDNRUN, M98095_SHDNRUN); - max98095_add_widgets(codec); - return 0; err_irq: @@ -2463,6 +2453,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max98095 = { .suspend = max98095_suspend, .resume = max98095_resume, .set_bias_level = max98095_set_bias_level, + .controls = max98095_snd_controls, + .num_controls = ARRAY_SIZE(max98095_snd_controls), .reg_cache_size = ARRAY_SIZE(max98095_reg_def), .reg_word_size = sizeof(u8), .reg_cache_default = max98095_reg_def, |