aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs42l73.c
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-03-11 00:43:20 -0400
committerMark Brown <broonie@linaro.org>2014-03-11 05:59:05 -0400
commit5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328 (patch)
tree332783c28f3fe037cdaaa86f9b30072904be6ddd /sound/soc/codecs/cs42l73.c
parentdb5a5ee7c7b20a1780f90c6f2b8de322844b6fe9 (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/cs42l73.c')
-rw-r--r--sound/soc/codecs/cs42l73.c11
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)
1348 1348
1349static int cs42l73_probe(struct snd_soc_codec *codec) 1349static int cs42l73_probe(struct snd_soc_codec *codec)
1350{ 1350{
1351 int ret;
1352 struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec); 1351 struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);
1353 1352
1354 codec->control_data = cs42l73->regmap;
1355
1356 ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
1357 if (ret < 0) {
1358 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
1359 return ret;
1360 }
1361
1362 cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY); 1353 cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1363 1354
1364 /* Set Charge Pump Frequency */ 1355 /* Set Charge Pump Frequency */
@@ -1371,7 +1362,7 @@ static int cs42l73_probe(struct snd_soc_codec *codec)
1371 cs42l73->mclksel = CS42L73_CLKID_MCLK1; 1362 cs42l73->mclksel = CS42L73_CLKID_MCLK1;
1372 cs42l73->mclk = 0; 1363 cs42l73->mclk = 0;
1373 1364
1374 return ret; 1365 return 0;
1375} 1366}
1376 1367
1377static int cs42l73_remove(struct snd_soc_codec *codec) 1368static int cs42l73_remove(struct snd_soc_codec *codec)