diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-28 17:27:02 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 11:53:28 +0000 |
| commit | a8ca52b7911378864e6defb42be9166c248a3749 (patch) | |
| tree | bf6a8fd36ea25e13ec8b43c1a739636888410e2a /sound/soc/codecs/ak4642.c | |
| parent | b34d7cf355116f5107fad8d42fb91d067a3b15bc (diff) | |
| download | op-kernel-dev-a8ca52b7911378864e6defb42be9166c248a3749.zip op-kernel-dev-a8ca52b7911378864e6defb42be9166c248a3749.tar.gz | |
ASoC: ak4642: Convert to table based control init
Improves error handling and saves code.
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/ak4642.c')
| -rw-r--r-- | sound/soc/codecs/ak4642.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 2f861c9..7fe1e90 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -469,9 +469,6 @@ static int ak4642_probe(struct snd_soc_codec *codec) return ret; } - snd_soc_add_codec_controls(codec, ak4642_snd_controls, - ARRAY_SIZE(ak4642_snd_controls)); - ak4642_set_bias_level(codec, SND_SOC_BIAS_STANDBY); return 0; @@ -491,6 +488,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4642 = { .reg_cache_default = ak4642_reg, /* ak4642 reg */ .reg_cache_size = ARRAY_SIZE(ak4642_reg), /* ak4642 reg */ .reg_word_size = sizeof(u8), + .controls = ak4642_snd_controls, + .num_controls = ARRAY_SIZE(ak4642_snd_controls), .dapm_widgets = ak4642_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(ak4642_dapm_widgets), .dapm_routes = ak4642_intercon, @@ -505,6 +504,8 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4648 = { .reg_cache_default = ak4648_reg, /* ak4648 reg */ .reg_cache_size = ARRAY_SIZE(ak4648_reg), /* ak4648 reg */ .reg_word_size = sizeof(u8), + .controls = ak4642_snd_controls, + .num_controls = ARRAY_SIZE(ak4642_snd_controls), .dapm_widgets = ak4642_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(ak4642_dapm_widgets), .dapm_routes = ak4642_intercon, |
