ASoC: Factor out snd_soc_init_card()

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

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 90ec8c58e2f4679d4d8869ebb1dc0a3998dbf5d7..70e0675b5d4a073bda3f10621400d40376bfc0af 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -404,17 +404,9 @@ static int wm8711_probe(struct platform_device *pdev)
        snd_soc_add_controls(codec, wm8711_snd_controls,
                             ARRAY_SIZE(wm8711_snd_controls));
        wm8711_add_widgets(codec);
-       ret = snd_soc_init_card(socdev);
-       if (ret < 0) {
-               dev_err(codec->dev, "failed to register card: %d\n", ret);
-               goto card_err;
-       }
 
        return ret;
 
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }
@@ -548,21 +540,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",
@@ -570,8 +547,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 */