ASoC: Remove snd_soc_suspend_device()

[linux-beck.git] / sound / soc / codecs / wm8711.c

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index ae083eb92fb7139c2c96aca38589dd6c9a82ceb0..54189fbf9e935912411c804cb4af200743ac36f4 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/spi/spi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -547,21 +548,6 @@ static int __devexit wm8711_spi_remove(struct spi_device *spi)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm8711_spi_suspend(struct spi_device *spi, pm_message_t msg)
-{
-       return snd_soc_suspend_device(&spi->dev);
-}
-
-static int wm8711_spi_resume(struct spi_device *spi)
-{
-       return snd_soc_resume_device(&spi->dev);
-}
-#else
-#define wm8711_spi_suspend NULL
-#define wm8711_spi_resume NULL
-#endif
-
 static struct spi_driver wm8711_spi_driver = {
        .driver = {
                .name   = "wm8711",
@@ -569,8 +555,6 @@ static struct spi_driver wm8711_spi_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = wm8711_spi_probe,
-       .suspend        = wm8711_spi_suspend,
-       .resume         = wm8711_spi_resume,
        .remove         = __devexit_p(wm8711_spi_remove),
 };
 #endif /* CONFIG_SPI_MASTER */
@@ -632,9 +616,9 @@ static int __init wm8711_modinit(void)
        }
 #endif
 #if defined(CONFIG_SPI_MASTER)
-       ret = spi_register_driver(&wm8731_spi_driver);
+       ret = spi_register_driver(&wm8711_spi_driver);
        if (ret != 0) {
-               printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n",
+               printk(KERN_ERR "Failed to register WM8711 SPI driver: %d\n",
                       ret);
        }
 #endif
@@ -648,7 +632,7 @@ static void __exit wm8711_exit(void)
        i2c_del_driver(&wm8711_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)
-       spi_unregister_driver(&wm8731_spi_driver);
+       spi_unregister_driver(&wm8711_spi_driver);
 #endif
 }
 module_exit(wm8711_exit);