diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-11 05:43:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-11 10:59:05 +0100 |
commit | 5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328 (patch) | |
tree | 332783c28f3fe037cdaaa86f9b30072904be6ddd /sound/soc/codecs/wm9081.c | |
parent | Merge branches 'topic/ad193x', 'topic/tlv320aic23', 'topic/tlv320aic32x4', 't... (diff) | |
download | linux-5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328.tar.xz linux-5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328.zip |
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/wm9081.c')
-rw-r--r-- | sound/soc/codecs/wm9081.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 0982c1d38ec4..cda185d436f7 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1265,15 +1265,6 @@ static struct snd_soc_dai_driver wm9081_dai = { static int wm9081_probe(struct snd_soc_codec *codec) { struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec); - int ret; - - codec->control_data = wm9081->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } /* Enable zero cross by default */ snd_soc_update_bits(codec, WM9081_ANALOGUE_LINEOUT, @@ -1288,7 +1279,7 @@ static int wm9081_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm9081_eq_controls)); } - return ret; + return 0; } static int wm9081_remove(struct snd_soc_codec *codec) |