ASoC: Make WM8770 SPI usage unconditional

The device only supports SPI.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index 8976eb5796d3ec057617524719cd8b05e2aec793..ea6f007a81148c5bc4ddb48af52286d8e5c43e90 100644 (file)
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -690,7 +690,6 @@ static const struct of_device_id wm8770_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8770_of_match);
 
-#if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8770_spi_probe(struct spi_device *spi)
 {
        struct wm8770_priv *wm8770;
@@ -726,28 +725,23 @@ static struct spi_driver wm8770_spi_driver = {
        .probe = wm8770_spi_probe,
        .remove = __devexit_p(wm8770_spi_remove)
 };
-#endif
 
 static int __init wm8770_modinit(void)
 {
        int ret = 0;
 
-#if defined(CONFIG_SPI_MASTER)
        ret = spi_register_driver(&wm8770_spi_driver);
        if (ret) {
                printk(KERN_ERR "Failed to register wm8770 SPI driver: %d\n",
                       ret);
        }
-#endif
        return ret;
 }
 module_init(wm8770_modinit);
 
 static void __exit wm8770_exit(void)
 {
-#if defined(CONFIG_SPI_MASTER)
        spi_unregister_driver(&wm8770_spi_driver);
-#endif
 }
 module_exit(wm8770_exit);