aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/codecs/wm8997.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-03-01 13:45:32 +0100
committerMark Brown <broonie@linaro.org>2014-03-04 12:05:21 +0800
commit055bbe2df957343fece60fe1f60553a9c1005217 (patch)
treee1dc5060dad76de431248baca7a597da5373ccd9 /sound/soc/codecs/wm8997.c
parentASoC: wm8997: Use ARRAY_SIZE() for SOC_VALUE_ENUM_SINGLE() (diff)
downloadwireguard-linux-055bbe2df957343fece60fe1f60553a9c1005217.tar.xz
wireguard-linux-055bbe2df957343fece60fe1f60553a9c1005217.zip
ASoC: wm{5102, 5110, 8997}: Replace codec->control_data with arizona->regmap
With the ongoing component-ization of the ASoC framework and the continuing migration to using regmap for IO the control_data field of the snd_soc_codec struct will eventually be removed. Prepare the wm5192, wm5110 and wm8997 drivers for this by using arizona->regmap instead of accessing the CODEC's control_data field. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm8997.c')
-rw-r--r--sound/soc/codecs/wm8997.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 4e6442ce9a2a..e10f44d7fdb7 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -86,7 +86,7 @@ static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w,
{
struct snd_soc_codec *codec = w->codec;
struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
- struct regmap *regmap = codec->control_data;
+ struct regmap *regmap = arizona->regmap;
const struct reg_default *patch = NULL;
int i, patch_size;