diff options
Diffstat (limited to 'sound/soc/codecs/tlv320aic26.c')
-rw-r--r-- | sound/soc/codecs/tlv320aic26.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 6b7d71ec0004..e2a7608d3944 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <sound/pcm.h> | 18 | #include <sound/pcm.h> |
19 | #include <sound/pcm_params.h> | 19 | #include <sound/pcm_params.h> |
20 | #include <sound/soc.h> | 20 | #include <sound/soc.h> |
21 | #include <sound/soc-dapm.h> | ||
22 | #include <sound/initval.h> | 21 | #include <sound/initval.h> |
23 | 22 | ||
24 | #include "tlv320aic26.h" | 23 | #include "tlv320aic26.h" |
@@ -31,7 +30,6 @@ MODULE_LICENSE("GPL"); | |||
31 | struct aic26 { | 30 | struct aic26 { |
32 | struct spi_device *spi; | 31 | struct spi_device *spi; |
33 | struct snd_soc_codec codec; | 32 | struct snd_soc_codec codec; |
34 | u16 reg_cache[AIC26_NUM_REGS]; /* shadow registers */ | ||
35 | int master; | 33 | int master; |
36 | int datfm; | 34 | int datfm; |
37 | int mclk; | 35 | int mclk; |
@@ -355,7 +353,6 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set); | |||
355 | */ | 353 | */ |
356 | static int aic26_probe(struct snd_soc_codec *codec) | 354 | static int aic26_probe(struct snd_soc_codec *codec) |
357 | { | 355 | { |
358 | struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec); | ||
359 | int ret, err, i, reg; | 356 | int ret, err, i, reg; |
360 | 357 | ||
361 | dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n"); | 358 | dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n"); |
@@ -373,7 +370,7 @@ static int aic26_probe(struct snd_soc_codec *codec) | |||
373 | aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg); | 370 | aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg); |
374 | 371 | ||
375 | /* Fill register cache */ | 372 | /* Fill register cache */ |
376 | for (i = 0; i < ARRAY_SIZE(aic26->reg_cache); i++) | 373 | for (i = 0; i < codec->driver->reg_cache_size; i++) |
377 | aic26_reg_read(codec, i); | 374 | aic26_reg_read(codec, i); |
378 | 375 | ||
379 | /* Register the sysfs files for debugging */ | 376 | /* Register the sysfs files for debugging */ |