diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-14 02:35:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-16 21:46:22 -0400 |
| commit | b2c812e22de88bb79c290c0e718280f10b64a48d (patch) | |
| tree | 4a5d967714cfb771db351cde525e6946897cca08 /sound/soc/codecs/wm_hubs.c | |
| parent | 890c681275ab02623de1187f2d97fc355d76f372 (diff) | |
ASoC: Add indirection for CODEC private data
One of the features of the multi CODEC work is that it embeds a struct
device in the CODEC to provide diagnostics via a sysfs class rather than
via the device tree, at which point it's much better to use the struct
device private data rather than having two places to store it. Provide
an accessor function to allow this change to be made more easily, and
update all the CODEC drivers are updated.
To ensure use of the accessor the private data structure member is
renamed, meaning that if code developed with older an older core that
still uses private_data is merged it will fail to build.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index e1f225a3ac46..defdbd08e135 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c | |||
| @@ -91,7 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) | |||
| 91 | */ | 91 | */ |
| 92 | static void calibrate_dc_servo(struct snd_soc_codec *codec) | 92 | static void calibrate_dc_servo(struct snd_soc_codec *codec) |
| 93 | { | 93 | { |
| 94 | struct wm_hubs_data *hubs = codec->private_data; | 94 | struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); |
| 95 | u16 reg, reg_l, reg_r, dcs_cfg; | 95 | u16 reg, reg_l, reg_r, dcs_cfg; |
| 96 | 96 | ||
| 97 | /* Set for 32 series updates */ | 97 | /* Set for 32 series updates */ |
| @@ -154,7 +154,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol, | |||
| 154 | struct snd_ctl_elem_value *ucontrol) | 154 | struct snd_ctl_elem_value *ucontrol) |
| 155 | { | 155 | { |
| 156 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 156 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); |
| 157 | struct wm_hubs_data *hubs = codec->private_data; | 157 | struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); |
| 158 | int ret; | 158 | int ret; |
| 159 | 159 | ||
| 160 | ret = snd_soc_put_volsw_2r(kcontrol, ucontrol); | 160 | ret = snd_soc_put_volsw_2r(kcontrol, ucontrol); |
| @@ -327,7 +327,7 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w, | |||
| 327 | struct snd_kcontrol *kcontrol, int event) | 327 | struct snd_kcontrol *kcontrol, int event) |
| 328 | { | 328 | { |
| 329 | struct snd_soc_codec *codec = w->codec; | 329 | struct snd_soc_codec *codec = w->codec; |
| 330 | struct wm_hubs_data *hubs = codec->private_data; | 330 | struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); |
| 331 | 331 | ||
| 332 | switch (event) { | 332 | switch (event) { |
| 333 | case SND_SOC_DAPM_PRE_PMU: | 333 | case SND_SOC_DAPM_PRE_PMU: |