diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-11 12:43:21 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:59:06 +0000 |
| commit | 092eba937d948a76ff55825922eff4df010f6a17 (patch) | |
| tree | 9ceee6b8bb67ec90bdb1d1f4dd812e3dfba8547d /sound/soc/codecs/si476x.c | |
| parent | 5d6be5aa6becc750c5c2aa0ef8f7209ce19aa328 (diff) | |
| download | linux-092eba937d948a76ff55825922eff4df010f6a17.tar.bz2 | |
ASoC: io: New signature for snd_soc_codec_set_cache_io()
Now that all users have been converted to regmap and the config.reg_bits
and config.val_bits can be setted by each user through regmap core API.
So these two params are redundant here.
Since the only control type that left is SND_SOC_REGMAP, so remove it. Drop
the control params and add struct regmap *regmap to simplify the code.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index fa2b8e07f420..244c097cd905 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -21,6 +21,7 @@ #include <linux/slab.h> #include <sound/pcm.h> #include <sound/pcm_params.h> +#include <linux/regmap.h> #include <sound/soc.h> #include <sound/initval.h> @@ -209,8 +210,9 @@ out: static int si476x_codec_probe(struct snd_soc_codec *codec) { - codec->control_data = dev_get_regmap(codec->dev->parent, NULL); - return snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); + 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 = { |