diff options
| -rw-r--r-- | sound/soc/codecs/wm8737.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index fe41dd2b9b45..ada9ac1ba2c6 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c | |||
| @@ -537,23 +537,6 @@ static struct snd_soc_dai_driver wm8737_dai = { | |||
| 537 | .ops = &wm8737_dai_ops, | 537 | .ops = &wm8737_dai_ops, |
| 538 | }; | 538 | }; |
| 539 | 539 | ||
| 540 | #ifdef CONFIG_PM | ||
| 541 | static int wm8737_suspend(struct snd_soc_codec *codec) | ||
| 542 | { | ||
| 543 | wm8737_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
| 544 | return 0; | ||
| 545 | } | ||
| 546 | |||
| 547 | static int wm8737_resume(struct snd_soc_codec *codec) | ||
| 548 | { | ||
| 549 | wm8737_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
| 550 | return 0; | ||
| 551 | } | ||
| 552 | #else | ||
| 553 | #define wm8737_suspend NULL | ||
| 554 | #define wm8737_resume NULL | ||
| 555 | #endif | ||
| 556 | |||
| 557 | static int wm8737_probe(struct snd_soc_codec *codec) | 540 | static int wm8737_probe(struct snd_soc_codec *codec) |
| 558 | { | 541 | { |
| 559 | struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); | 542 | struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); |
| @@ -590,18 +573,10 @@ err_get: | |||
| 590 | return ret; | 573 | return ret; |
| 591 | } | 574 | } |
| 592 | 575 | ||
| 593 | static int wm8737_remove(struct snd_soc_codec *codec) | ||
| 594 | { | ||
| 595 | wm8737_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
| 596 | return 0; | ||
| 597 | } | ||
| 598 | |||
| 599 | static struct snd_soc_codec_driver soc_codec_dev_wm8737 = { | 576 | static struct snd_soc_codec_driver soc_codec_dev_wm8737 = { |
| 600 | .probe = wm8737_probe, | 577 | .probe = wm8737_probe, |
| 601 | .remove = wm8737_remove, | ||
| 602 | .suspend = wm8737_suspend, | ||
| 603 | .resume = wm8737_resume, | ||
| 604 | .set_bias_level = wm8737_set_bias_level, | 578 | .set_bias_level = wm8737_set_bias_level, |
| 579 | .suspend_bias_off = true, | ||
| 605 | 580 | ||
| 606 | .controls = wm8737_snd_controls, | 581 | .controls = wm8737_snd_controls, |
| 607 | .num_controls = ARRAY_SIZE(wm8737_snd_controls), | 582 | .num_controls = ARRAY_SIZE(wm8737_snd_controls), |
