diff options
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 6f38d619bf8a..2727befd158e 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <sound/pcm.h> | 38 | #include <sound/pcm.h> |
39 | #include <sound/pcm_params.h> | 39 | #include <sound/pcm_params.h> |
40 | #include <sound/soc.h> | 40 | #include <sound/soc.h> |
41 | #include <sound/soc-dapm.h> | ||
42 | #include <sound/initval.h> | 41 | #include <sound/initval.h> |
43 | 42 | ||
44 | #include "ssm2602.h" | 43 | #include "ssm2602.h" |
@@ -207,10 +206,11 @@ static const struct snd_soc_dapm_route audio_conn[] = { | |||
207 | 206 | ||
208 | static int ssm2602_add_widgets(struct snd_soc_codec *codec) | 207 | static int ssm2602_add_widgets(struct snd_soc_codec *codec) |
209 | { | 208 | { |
210 | snd_soc_dapm_new_controls(codec, ssm2602_dapm_widgets, | 209 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
211 | ARRAY_SIZE(ssm2602_dapm_widgets)); | ||
212 | 210 | ||
213 | snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn)); | 211 | snd_soc_dapm_new_controls(dapm, ssm2602_dapm_widgets, |
212 | ARRAY_SIZE(ssm2602_dapm_widgets)); | ||
213 | snd_soc_dapm_add_routes(dapm, audio_conn, ARRAY_SIZE(audio_conn)); | ||
214 | 214 | ||
215 | return 0; | 215 | return 0; |
216 | } | 216 | } |
@@ -493,7 +493,7 @@ static int ssm2602_set_bias_level(struct snd_soc_codec *codec, | |||
493 | break; | 493 | break; |
494 | 494 | ||
495 | } | 495 | } |
496 | codec->bias_level = level; | 496 | codec->dapm.bias_level = level; |
497 | return 0; | 497 | return 0; |
498 | } | 498 | } |
499 | 499 | ||