aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8731.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r--sound/soc/codecs/wm8731.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index d3fd4f28d96e..0e59219a59f4 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -623,21 +623,6 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi)
623 return 0; 623 return 0;
624} 624}
625 625
626#ifdef CONFIG_PM
627static int wm8731_spi_suspend(struct spi_device *spi, pm_message_t msg)
628{
629 return snd_soc_suspend_device(&spi->dev);
630}
631
632static int wm8731_spi_resume(struct spi_device *spi)
633{
634 return snd_soc_resume_device(&spi->dev);
635}
636#else
637#define wm8731_spi_suspend NULL
638#define wm8731_spi_resume NULL
639#endif
640
641static struct spi_driver wm8731_spi_driver = { 626static struct spi_driver wm8731_spi_driver = {
642 .driver = { 627 .driver = {
643 .name = "wm8731", 628 .name = "wm8731",
@@ -645,8 +630,6 @@ static struct spi_driver wm8731_spi_driver = {
645 .owner = THIS_MODULE, 630 .owner = THIS_MODULE,
646 }, 631 },
647 .probe = wm8731_spi_probe, 632 .probe = wm8731_spi_probe,
648 .suspend = wm8731_spi_suspend,
649 .resume = wm8731_spi_resume,
650 .remove = __devexit_p(wm8731_spi_remove), 633 .remove = __devexit_p(wm8731_spi_remove),
651}; 634};
652#endif /* CONFIG_SPI_MASTER */ 635#endif /* CONFIG_SPI_MASTER */
@@ -679,21 +662,6 @@ static __devexit int wm8731_i2c_remove(struct i2c_client *client)
679 return 0; 662 return 0;
680} 663}
681 664
682#ifdef CONFIG_PM
683static int wm8731_i2c_suspend(struct i2c_client *i2c, pm_message_t msg)
684{
685 return snd_soc_suspend_device(&i2c->dev);
686}
687
688static int wm8731_i2c_resume(struct i2c_client *i2c)
689{
690 return snd_soc_resume_device(&i2c->dev);
691}
692#else
693#define wm8731_i2c_suspend NULL
694#define wm8731_i2c_resume NULL
695#endif
696
697static const struct i2c_device_id wm8731_i2c_id[] = { 665static const struct i2c_device_id wm8731_i2c_id[] = {
698 { "wm8731", 0 }, 666 { "wm8731", 0 },
699 { } 667 { }
@@ -707,8 +675,6 @@ static struct i2c_driver wm8731_i2c_driver = {
707 }, 675 },
708 .probe = wm8731_i2c_probe, 676 .probe = wm8731_i2c_probe,
709 .remove = __devexit_p(wm8731_i2c_remove), 677 .remove = __devexit_p(wm8731_i2c_remove),
710 .suspend = wm8731_i2c_suspend,
711 .resume = wm8731_i2c_resume,
712 .id_table = wm8731_i2c_id, 678 .id_table = wm8731_i2c_id,
713}; 679};
714#endif 680#endif