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/wm8904.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 | linux-dev-5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328.tar.xz linux-dev-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/wm8904.c')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 53bbfac6a83a..817dddc7f8a1 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2047,9 +2047,6 @@ static void wm8904_handle_pdata(struct snd_soc_codec *codec) static int wm8904_probe(struct snd_soc_codec *codec) { struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); - int ret; - - codec->control_data = wm8904->regmap; switch (wm8904->devtype) { case WM8904: @@ -2063,12 +2060,6 @@ static int wm8904_probe(struct snd_soc_codec *codec) return -EINVAL; } - 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; - } - wm8904_handle_pdata(codec); wm8904_add_widgets(codec); |