summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/da732x.c
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-03-11 08:43:20 +0400
committerMark Brown <broonie@linaro.org>2014-03-11 13:59:05 +0400
commit5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328 (patch)
tree332783c28f3fe037cdaaa86f9b30072904be6ddd /sound/soc/codecs/da732x.c
parentdb5a5ee7c7b20a1780f90c6f2b8de322844b6fe9 (diff)
downloadlinux-5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328.tar.xz
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/da732x.c')
-rw-r--r--sound/soc/codecs/da732x.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 8053e0e7f4a7..fdefc4bb8bc4 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1516,23 +1516,14 @@ static int da732x_probe(struct snd_soc_codec *codec)
{
struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec);
struct snd_soc_dapm_context *dapm = &codec->dapm;
- int ret = 0;
da732x->codec = codec;
dapm->idle_bias_off = false;
- codec->control_data = da732x->regmap;
-
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
- if (ret != 0) {
- dev_err(codec->dev, "Failed to register codec.\n");
- goto err;
- }
-
da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-err:
- return ret;
+
+ return 0;
}
static int da732x_remove(struct snd_soc_codec *codec)