diff options
Diffstat (limited to 'sound/soc/codecs/wl1273.c')
-rw-r--r-- | sound/soc/codecs/wl1273.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c index 6be5f80b65f1..4ead0dc02b87 100644 --- a/sound/soc/codecs/wl1273.c +++ b/sound/soc/codecs/wl1273.c | |||
@@ -172,7 +172,7 @@ out: | |||
172 | static int snd_wl1273_get_audio_route(struct snd_kcontrol *kcontrol, | 172 | static int snd_wl1273_get_audio_route(struct snd_kcontrol *kcontrol, |
173 | struct snd_ctl_elem_value *ucontrol) | 173 | struct snd_ctl_elem_value *ucontrol) |
174 | { | 174 | { |
175 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 175 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
176 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); | 176 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); |
177 | 177 | ||
178 | ucontrol->value.integer.value[0] = wl1273->mode; | 178 | ucontrol->value.integer.value[0] = wl1273->mode; |
@@ -190,7 +190,7 @@ static const char * const wl1273_audio_route[] = { "Bt", "FmRx", "FmTx" }; | |||
190 | static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol, | 190 | static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol, |
191 | struct snd_ctl_elem_value *ucontrol) | 191 | struct snd_ctl_elem_value *ucontrol) |
192 | { | 192 | { |
193 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 193 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
194 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); | 194 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); |
195 | 195 | ||
196 | if (wl1273->mode == ucontrol->value.integer.value[0]) | 196 | if (wl1273->mode == ucontrol->value.integer.value[0]) |
@@ -214,7 +214,7 @@ static SOC_ENUM_SINGLE_EXT_DECL(wl1273_enum, wl1273_audio_route); | |||
214 | static int snd_wl1273_fm_audio_get(struct snd_kcontrol *kcontrol, | 214 | static int snd_wl1273_fm_audio_get(struct snd_kcontrol *kcontrol, |
215 | struct snd_ctl_elem_value *ucontrol) | 215 | struct snd_ctl_elem_value *ucontrol) |
216 | { | 216 | { |
217 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 217 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
218 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); | 218 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); |
219 | 219 | ||
220 | dev_dbg(codec->dev, "%s: enter.\n", __func__); | 220 | dev_dbg(codec->dev, "%s: enter.\n", __func__); |
@@ -227,7 +227,7 @@ static int snd_wl1273_fm_audio_get(struct snd_kcontrol *kcontrol, | |||
227 | static int snd_wl1273_fm_audio_put(struct snd_kcontrol *kcontrol, | 227 | static int snd_wl1273_fm_audio_put(struct snd_kcontrol *kcontrol, |
228 | struct snd_ctl_elem_value *ucontrol) | 228 | struct snd_ctl_elem_value *ucontrol) |
229 | { | 229 | { |
230 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 230 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
231 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); | 231 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); |
232 | int val, r = 0; | 232 | int val, r = 0; |
233 | 233 | ||
@@ -251,7 +251,7 @@ static SOC_ENUM_SINGLE_EXT_DECL(wl1273_audio_enum, wl1273_audio_strings); | |||
251 | static int snd_wl1273_fm_volume_get(struct snd_kcontrol *kcontrol, | 251 | static int snd_wl1273_fm_volume_get(struct snd_kcontrol *kcontrol, |
252 | struct snd_ctl_elem_value *ucontrol) | 252 | struct snd_ctl_elem_value *ucontrol) |
253 | { | 253 | { |
254 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 254 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
255 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); | 255 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); |
256 | 256 | ||
257 | dev_dbg(codec->dev, "%s: enter.\n", __func__); | 257 | dev_dbg(codec->dev, "%s: enter.\n", __func__); |
@@ -264,7 +264,7 @@ static int snd_wl1273_fm_volume_get(struct snd_kcontrol *kcontrol, | |||
264 | static int snd_wl1273_fm_volume_put(struct snd_kcontrol *kcontrol, | 264 | static int snd_wl1273_fm_volume_put(struct snd_kcontrol *kcontrol, |
265 | struct snd_ctl_elem_value *ucontrol) | 265 | struct snd_ctl_elem_value *ucontrol) |
266 | { | 266 | { |
267 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 267 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
268 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); | 268 | struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec); |
269 | int r; | 269 | int r; |
270 | 270 | ||