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/sta32x.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/sta32x.c')
| -rw-r--r-- | sound/soc/codecs/sta32x.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 06edb396e733..1cab6f62be7c 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -872,16 +872,6 @@ static int sta32x_probe(struct snd_soc_codec *codec) return ret; } - /* Tell ASoC what kind of I/O to use to read the registers. ASoC will - * then do the I2C transactions itself. - */ - codec->control_data = sta32x->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 (ret=%i)\n", ret); - goto err; - } - /* Chip documentation explicitly requires that the reset values * of reserved register bits are left untouched. * Write the register default value to cache for reserved registers, @@ -946,10 +936,6 @@ static int sta32x_probe(struct snd_soc_codec *codec) regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies); return 0; - -err: - regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies); - return ret; } static int sta32x_remove(struct snd_soc_codec *codec) |