diff options
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 1725550c293e..d2c315fa1b9b 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
| @@ -3479,31 +3479,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) | |||
| 3479 | } | 3479 | } |
| 3480 | EXPORT_SYMBOL_GPL(wm8962_mic_detect); | 3480 | EXPORT_SYMBOL_GPL(wm8962_mic_detect); |
| 3481 | 3481 | ||
| 3482 | #ifdef CONFIG_PM | ||
| 3483 | static int wm8962_resume(struct snd_soc_codec *codec) | ||
| 3484 | { | ||
| 3485 | u16 *reg_cache = codec->reg_cache; | ||
| 3486 | int i; | ||
| 3487 | |||
| 3488 | /* Restore the registers */ | ||
| 3489 | for (i = 1; i < codec->driver->reg_cache_size; i++) { | ||
| 3490 | switch (i) { | ||
| 3491 | case WM8962_SOFTWARE_RESET: | ||
| 3492 | continue; | ||
| 3493 | default: | ||
| 3494 | break; | ||
| 3495 | } | ||
| 3496 | |||
| 3497 | if (reg_cache[i] != wm8962_reg[i]) | ||
| 3498 | snd_soc_write(codec, i, reg_cache[i]); | ||
| 3499 | } | ||
| 3500 | |||
| 3501 | return 0; | ||
| 3502 | } | ||
| 3503 | #else | ||
| 3504 | #define wm8962_resume NULL | ||
| 3505 | #endif | ||
| 3506 | |||
| 3507 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 3482 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) |
| 3508 | static int beep_rates[] = { | 3483 | static int beep_rates[] = { |
| 3509 | 500, 1000, 2000, 4000, | 3484 | 500, 1000, 2000, 4000, |
| @@ -4015,7 +3990,6 @@ static int wm8962_remove(struct snd_soc_codec *codec) | |||
| 4015 | static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { | 3990 | static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { |
| 4016 | .probe = wm8962_probe, | 3991 | .probe = wm8962_probe, |
| 4017 | .remove = wm8962_remove, | 3992 | .remove = wm8962_remove, |
| 4018 | .resume = wm8962_resume, | ||
| 4019 | .set_bias_level = wm8962_set_bias_level, | 3993 | .set_bias_level = wm8962_set_bias_level, |
| 4020 | .reg_cache_size = WM8962_MAX_REGISTER + 1, | 3994 | .reg_cache_size = WM8962_MAX_REGISTER + 1, |
| 4021 | .reg_word_size = sizeof(u16), | 3995 | .reg_word_size = sizeof(u16), |
