diff options
Diffstat (limited to 'sound/soc/codecs/max98088.c')
-rw-r--r-- | sound/soc/codecs/max98088.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index d63e28773eb1..335a002aaf0e 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
21 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
23 | #include <sound/soc-dapm.h> | ||
24 | #include <sound/initval.h> | 23 | #include <sound/initval.h> |
25 | #include <sound/tlv.h> | 24 | #include <sound/tlv.h> |
26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
@@ -1230,15 +1229,17 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
1230 | 1229 | ||
1231 | static int max98088_add_widgets(struct snd_soc_codec *codec) | 1230 | static int max98088_add_widgets(struct snd_soc_codec *codec) |
1232 | { | 1231 | { |
1233 | snd_soc_dapm_new_controls(codec, max98088_dapm_widgets, | 1232 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
1233 | |||
1234 | snd_soc_dapm_new_controls(dapm, max98088_dapm_widgets, | ||
1234 | ARRAY_SIZE(max98088_dapm_widgets)); | 1235 | ARRAY_SIZE(max98088_dapm_widgets)); |
1235 | 1236 | ||
1236 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 1237 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
1237 | 1238 | ||
1238 | snd_soc_add_controls(codec, max98088_snd_controls, | 1239 | snd_soc_add_controls(codec, max98088_snd_controls, |
1239 | ARRAY_SIZE(max98088_snd_controls)); | 1240 | ARRAY_SIZE(max98088_snd_controls)); |
1240 | 1241 | ||
1241 | snd_soc_dapm_new_widgets(codec); | 1242 | snd_soc_dapm_new_widgets(dapm); |
1242 | return 0; | 1243 | return 0; |
1243 | } | 1244 | } |
1244 | 1245 | ||
@@ -1623,7 +1624,7 @@ static int max98088_set_bias_level(struct snd_soc_codec *codec, | |||
1623 | break; | 1624 | break; |
1624 | 1625 | ||
1625 | case SND_SOC_BIAS_STANDBY: | 1626 | case SND_SOC_BIAS_STANDBY: |
1626 | if (codec->bias_level == SND_SOC_BIAS_OFF) | 1627 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) |
1627 | max98088_sync_cache(codec); | 1628 | max98088_sync_cache(codec); |
1628 | 1629 | ||
1629 | snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN, | 1630 | snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN, |
@@ -1636,7 +1637,7 @@ static int max98088_set_bias_level(struct snd_soc_codec *codec, | |||
1636 | codec->cache_sync = 1; | 1637 | codec->cache_sync = 1; |
1637 | break; | 1638 | break; |
1638 | } | 1639 | } |
1639 | codec->bias_level = level; | 1640 | codec->dapm.bias_level = level; |
1640 | return 0; | 1641 | return 0; |
1641 | } | 1642 | } |
1642 | 1643 | ||