ASoC: max98088: Use table based control init
authorMark Brown <broonie@linaro.org>
Mon, 23 Sep 2013 16:54:02 +0000 (17:54 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 24 Sep 2013 10:11:41 +0000 (11:11 +0100)
Tested-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/max98088.c

index 391f669..8896d5e 100644 (file)
@@ -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,