diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-31 13:21:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-17 00:41:39 +0100 |
| commit | b8cc4151f8af97e1b573ca399a77f439f401a57e (patch) | |
| tree | 66b9b6afc707e406a4bb9ac88e80238aabb06ffc | |
| parent | 37c83edf9afd3d7b39ace9113a166c03b7a2820f (diff) | |
| download | op-kernel-dev-b8cc4151f8af97e1b573ca399a77f439f401a57e.zip op-kernel-dev-b8cc4151f8af97e1b573ca399a77f439f401a57e.tar.gz | |
ASoC: wm8400: Use regmap for I/O
Since we no longer have a fake register to simulate we can use the
framework for I/O.
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/codecs/wm8400.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 95c33d1..48dc7d2 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -67,25 +67,6 @@ struct wm8400_priv { int fll_in, fll_out; }; -static inline unsigned int wm8400_read(struct snd_soc_codec *codec, - unsigned int reg) -{ - struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec); - - return wm8400_reg_read(wm8400->wm8400, reg); -} - -/* - * write to the wm8400 register space - */ -static int wm8400_write(struct snd_soc_codec *codec, unsigned int reg, - unsigned int value) -{ - struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec); - - return wm8400_set_bits(wm8400->wm8400, reg, 0xffff, value); -} - static void wm8400_codec_reset(struct snd_soc_codec *codec) { struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec); @@ -1328,9 +1309,12 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) return -ENOMEM; snd_soc_codec_set_drvdata(codec, priv); - codec->control_data = priv->wm8400 = wm8400; + priv->wm8400 = wm8400; + codec->control_data = wm8400->regmap; priv->codec = codec; + snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); + ret = devm_regulator_bulk_get(wm8400->dev, ARRAY_SIZE(power), &power[0]); if (ret != 0) { @@ -1377,8 +1361,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { .remove = wm8400_codec_remove, .suspend = wm8400_suspend, .resume = wm8400_resume, - .read = snd_soc_read, - .write = wm8400_write, .set_bias_level = wm8400_set_bias_level, .controls = wm8400_snd_controls, |
