diff options
Diffstat (limited to 'sound/soc/codecs/cs42l51.c')
-rw-r--r-- | sound/soc/codecs/cs42l51.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index cb086eaf4e0..8fb7070108d 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <sound/core.h> | 27 | #include <sound/core.h> |
28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
29 | #include <sound/soc-dapm.h> | ||
30 | #include <sound/tlv.h> | 29 | #include <sound/tlv.h> |
31 | #include <sound/initval.h> | 30 | #include <sound/initval.h> |
32 | #include <sound/pcm_params.h> | 31 | #include <sound/pcm_params.h> |
@@ -47,7 +46,6 @@ struct cs42l51_private { | |||
47 | unsigned int mclk; | 46 | unsigned int mclk; |
48 | unsigned int audio_mode; /* The mode (I2S or left-justified) */ | 47 | unsigned int audio_mode; /* The mode (I2S or left-justified) */ |
49 | enum master_slave_mode func; | 48 | enum master_slave_mode func; |
50 | u8 reg_cache[CS42L51_NUMREGS]; | ||
51 | }; | 49 | }; |
52 | 50 | ||
53 | #define CS42L51_FORMATS ( \ | 51 | #define CS42L51_FORMATS ( \ |
@@ -519,6 +517,7 @@ static struct snd_soc_dai_driver cs42l51_dai = { | |||
519 | static int cs42l51_probe(struct snd_soc_codec *codec) | 517 | static int cs42l51_probe(struct snd_soc_codec *codec) |
520 | { | 518 | { |
521 | struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); | 519 | struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); |
520 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
522 | int ret, reg; | 521 | int ret, reg; |
523 | 522 | ||
524 | codec->control_data = cs42l51->control_data; | 523 | codec->control_data = cs42l51->control_data; |
@@ -550,9 +549,9 @@ static int cs42l51_probe(struct snd_soc_codec *codec) | |||
550 | 549 | ||
551 | snd_soc_add_controls(codec, cs42l51_snd_controls, | 550 | snd_soc_add_controls(codec, cs42l51_snd_controls, |
552 | ARRAY_SIZE(cs42l51_snd_controls)); | 551 | ARRAY_SIZE(cs42l51_snd_controls)); |
553 | snd_soc_dapm_new_controls(codec, cs42l51_dapm_widgets, | 552 | snd_soc_dapm_new_controls(dapm, cs42l51_dapm_widgets, |
554 | ARRAY_SIZE(cs42l51_dapm_widgets)); | 553 | ARRAY_SIZE(cs42l51_dapm_widgets)); |
555 | snd_soc_dapm_add_routes(codec, cs42l51_routes, | 554 | snd_soc_dapm_add_routes(dapm, cs42l51_routes, |
556 | ARRAY_SIZE(cs42l51_routes)); | 555 | ARRAY_SIZE(cs42l51_routes)); |
557 | 556 | ||
558 | return 0; | 557 | return 0; |