diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-11 12:43:20 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:59:05 +0000 |
| commit | 5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328 (patch) | |
| tree | 332783c28f3fe037cdaaa86f9b30072904be6ddd /sound/soc/codecs/wm8996.c | |
| parent | db5a5ee7c7b20a1780f90c6f2b8de322844b6fe9 (diff) | |
ASoC: codec: Simplify ASoC probe code.
For some CODEC drivers like who act as the MFDs children are ignored
by this patch.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 1a7655b0aa22..54066436d72c 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2628,14 +2628,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) init_completion(&wm8996->dcs_done); init_completion(&wm8996->fll_lock); - codec->control_data = wm8996->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - goto err; - } - if (wm8996->pdata.num_retune_mobile_cfgs) wm8996_retune_mobile_pdata(codec); else @@ -2674,13 +2666,11 @@ static int wm8996_probe(struct snd_soc_codec *codec) } else { dev_err(codec->dev, "Failed to request IRQ: %d\n", ret); + return ret; } } return 0; - -err: - return ret; } static int wm8996_remove(struct snd_soc_codec *codec) |