Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / wireless / wl12xx / spi.c

diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c
index 51662bb..e0b3736 100644 (file)
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/crc7.h>
@@ -435,8 +436,6 @@ static int __devinit wl1271_probe(struct spi_device *spi)
        if (ret)
                goto out_irq;
 
-       wl1271_notice("initialized");
-
        return 0;
 
  out_irq:
@@ -473,23 +472,12 @@ static struct spi_driver wl1271_spi_driver = {
 
 static int __init wl1271_init(void)
 {
-       int ret;
-
-       ret = spi_register_driver(&wl1271_spi_driver);
-       if (ret < 0) {
-               wl1271_error("failed to register spi driver: %d", ret);
-               goto out;
-       }
-
-out:
-       return ret;
+       return spi_register_driver(&wl1271_spi_driver);
 }
 
 static void __exit wl1271_exit(void)
 {
        spi_unregister_driver(&wl1271_spi_driver);
-
-       wl1271_notice("unloaded");
 }
 
 module_init(wl1271_init);