diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-26 13:40:27 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-14 17:22:19 +0100 |
| commit | 83905ef3cbd0025830e9db65bf5ce7db721e39a7 (patch) | |
| tree | 6cd8b710e2189350b412dc71284c3615d9b01cca /sound/soc/codecs/si476x.c | |
| parent | d957f1651ed2976e18c75c5644a92ed471c3ae9e (diff) | |
| download | talos-obmc-linux-83905ef3cbd0025830e9db65bf5ce7db721e39a7.tar.gz talos-obmc-linux-83905ef3cbd0025830e9db65bf5ce7db721e39a7.zip | |
ASoC: si476x: Remove the set_cache_io() entirely from ASoC probe.
As we can set the CODEC I/O while snd_soc_register_codec(), so the
calling of set_cache_io() from CODEC ASoC probe could be removed
entirely.
And then we can set the CODEC I/O in the device probe instead of
CODEC ASoC probe as earily as possible.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/si476x.c')
| -rw-r--r-- | sound/soc/codecs/si476x.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index 244c097cd905..961b7e8ac0da 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -208,13 +208,6 @@ out: return err; } -static int si476x_codec_probe(struct snd_soc_codec *codec) -{ - struct regmap *regmap = dev_get_regmap(codec->dev->parent, NULL); - - return snd_soc_codec_set_cache_io(codec, regmap); -} - static struct snd_soc_dai_ops si476x_dai_ops = { .hw_params = si476x_codec_hw_params, .set_fmt = si476x_codec_set_dai_fmt, @@ -238,8 +231,13 @@ static struct snd_soc_dai_driver si476x_dai = { .ops = &si476x_dai_ops, }; +struct regmap *si476x_get_regmap(struct device *dev) +{ + return dev_get_regmap(dev->parent, NULL); +} + static struct snd_soc_codec_driver soc_codec_dev_si476x = { - .probe = si476x_codec_probe, + .get_regmap = si476x_get_regmap, .dapm_widgets = si476x_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), .dapm_routes = si476x_dapm_routes, |
