diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-30 15:26:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-03 08:33:53 -0400 |
commit | f59fef441753cdd07ffe7268b0801ec48cac7b1d (patch) | |
tree | cdd32f30d3d533ad9454bf2a744145f78a8f2b09 /sound/soc/codecs/wm8350.c | |
parent | 6c9d8cf6372ed2995a3d982f5c1f966e842101cc (diff) |
ASoC: wm8350: Convert to direct regmap API usage
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index e782a5aa2a31..d26c8ae4e6d9 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -71,20 +71,6 @@ struct wm8350_data { | |||
71 | int fll_freq_in; | 71 | int fll_freq_in; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static unsigned int wm8350_codec_read(struct snd_soc_codec *codec, | ||
75 | unsigned int reg) | ||
76 | { | ||
77 | struct wm8350 *wm8350 = codec->control_data; | ||
78 | return wm8350_reg_read(wm8350, reg); | ||
79 | } | ||
80 | |||
81 | static int wm8350_codec_write(struct snd_soc_codec *codec, unsigned int reg, | ||
82 | unsigned int value) | ||
83 | { | ||
84 | struct wm8350 *wm8350 = codec->control_data; | ||
85 | return wm8350_reg_write(wm8350, reg, value); | ||
86 | } | ||
87 | |||
88 | /* | 74 | /* |
89 | * Ramp OUT1 PGA volume to minimise pops at stream startup and shutdown. | 75 | * Ramp OUT1 PGA volume to minimise pops at stream startup and shutdown. |
90 | */ | 76 | */ |
@@ -1519,7 +1505,9 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) | |||
1519 | if (ret != 0) | 1505 | if (ret != 0) |
1520 | return ret; | 1506 | return ret; |
1521 | 1507 | ||
1522 | codec->control_data = wm8350; | 1508 | codec->control_data = wm8350->regmap; |
1509 | |||
1510 | snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); | ||
1523 | 1511 | ||
1524 | /* Put the codec into reset if it wasn't already */ | 1512 | /* Put the codec into reset if it wasn't already */ |
1525 | wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); | 1513 | wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); |
@@ -1629,8 +1617,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { | |||
1629 | .remove = wm8350_codec_remove, | 1617 | .remove = wm8350_codec_remove, |
1630 | .suspend = wm8350_suspend, | 1618 | .suspend = wm8350_suspend, |
1631 | .resume = wm8350_resume, | 1619 | .resume = wm8350_resume, |
1632 | .read = wm8350_codec_read, | ||
1633 | .write = wm8350_codec_write, | ||
1634 | .set_bias_level = wm8350_set_bias_level, | 1620 | .set_bias_level = wm8350_set_bias_level, |
1635 | 1621 | ||
1636 | .controls = wm8350_snd_controls, | 1622 | .controls = wm8350_snd_controls, |