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/cs42l73.c | |
| parent | Merge branches 'topic/ad193x', 'topic/tlv320aic23', 'topic/tlv320aic32x4', 'topic/wm8991', 'fix/si476x' and 'fix/88pm860' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-io (diff) | |
| download | wireguard-linux-5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328.tar.xz wireguard-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/cs42l73.c')
| -rw-r--r-- | sound/soc/codecs/cs42l73.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 549d5d6a3fef..b9aa009b5b01 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1348,17 +1348,8 @@ static int cs42l73_resume(struct snd_soc_codec *codec) static int cs42l73_probe(struct snd_soc_codec *codec) { - int ret; struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec); - codec->control_data = cs42l73->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY); /* Set Charge Pump Frequency */ @@ -1371,7 +1362,7 @@ static int cs42l73_probe(struct snd_soc_codec *codec) cs42l73->mclksel = CS42L73_CLKID_MCLK1; cs42l73->mclk = 0; - return ret; + return 0; } static int cs42l73_remove(struct snd_soc_codec *codec) |