diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-13 12:39:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-15 10:01:43 -0400 |
commit | d2058b0cd039aad89b111d83b9c347e9d8f57a84 (patch) | |
tree | 6bd622cf1ba7518a2e01cab18302b8bdea8b727c /sound/soc/codecs/wm8776.c | |
parent | ed9d040d40942e9c48167f9f37f86fab8e0e5e17 (diff) |
ASoC: Remove snd_soc_suspend_device()
The PM core will grow pm_link infrastructure in 2.6.33 which can be
used to implement the intended functionality of the ASoC-specific
device suspend and resume callbacks so drop them.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8776.c')
-rw-r--r-- | sound/soc/codecs/wm8776.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index a9829aa26e53..a0bbb28eed75 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -616,21 +616,6 @@ static int __devexit wm8776_spi_remove(struct spi_device *spi) | |||
616 | return 0; | 616 | return 0; |
617 | } | 617 | } |
618 | 618 | ||
619 | #ifdef CONFIG_PM | ||
620 | static int wm8776_spi_suspend(struct spi_device *spi, pm_message_t msg) | ||
621 | { | ||
622 | return snd_soc_suspend_device(&spi->dev); | ||
623 | } | ||
624 | |||
625 | static int wm8776_spi_resume(struct spi_device *spi) | ||
626 | { | ||
627 | return snd_soc_resume_device(&spi->dev); | ||
628 | } | ||
629 | #else | ||
630 | #define wm8776_spi_suspend NULL | ||
631 | #define wm8776_spi_resume NULL | ||
632 | #endif | ||
633 | |||
634 | static struct spi_driver wm8776_spi_driver = { | 619 | static struct spi_driver wm8776_spi_driver = { |
635 | .driver = { | 620 | .driver = { |
636 | .name = "wm8776", | 621 | .name = "wm8776", |
@@ -638,8 +623,6 @@ static struct spi_driver wm8776_spi_driver = { | |||
638 | .owner = THIS_MODULE, | 623 | .owner = THIS_MODULE, |
639 | }, | 624 | }, |
640 | .probe = wm8776_spi_probe, | 625 | .probe = wm8776_spi_probe, |
641 | .suspend = wm8776_spi_suspend, | ||
642 | .resume = wm8776_spi_resume, | ||
643 | .remove = __devexit_p(wm8776_spi_remove), | 626 | .remove = __devexit_p(wm8776_spi_remove), |
644 | }; | 627 | }; |
645 | #endif /* CONFIG_SPI_MASTER */ | 628 | #endif /* CONFIG_SPI_MASTER */ |
@@ -673,21 +656,6 @@ static __devexit int wm8776_i2c_remove(struct i2c_client *client) | |||
673 | return 0; | 656 | return 0; |
674 | } | 657 | } |
675 | 658 | ||
676 | #ifdef CONFIG_PM | ||
677 | static int wm8776_i2c_suspend(struct i2c_client *i2c, pm_message_t msg) | ||
678 | { | ||
679 | return snd_soc_suspend_device(&i2c->dev); | ||
680 | } | ||
681 | |||
682 | static int wm8776_i2c_resume(struct i2c_client *i2c) | ||
683 | { | ||
684 | return snd_soc_resume_device(&i2c->dev); | ||
685 | } | ||
686 | #else | ||
687 | #define wm8776_i2c_suspend NULL | ||
688 | #define wm8776_i2c_resume NULL | ||
689 | #endif | ||
690 | |||
691 | static const struct i2c_device_id wm8776_i2c_id[] = { | 659 | static const struct i2c_device_id wm8776_i2c_id[] = { |
692 | { "wm8776", 0 }, | 660 | { "wm8776", 0 }, |
693 | { } | 661 | { } |
@@ -701,8 +669,6 @@ static struct i2c_driver wm8776_i2c_driver = { | |||
701 | }, | 669 | }, |
702 | .probe = wm8776_i2c_probe, | 670 | .probe = wm8776_i2c_probe, |
703 | .remove = __devexit_p(wm8776_i2c_remove), | 671 | .remove = __devexit_p(wm8776_i2c_remove), |
704 | .suspend = wm8776_i2c_suspend, | ||
705 | .resume = wm8776_i2c_resume, | ||
706 | .id_table = wm8776_i2c_id, | 672 | .id_table = wm8776_i2c_id, |
707 | }; | 673 | }; |
708 | #endif | 674 | #endif |