Merge remote-tracking branch 'spi/topic/probe' into spi-next

3 files changed, 7 insertions, 4 deletions

diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index e06400a3a719..c4141c92bcff 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -985,6 +985,7 @@ static int au1550_spi_remove(struct platform_device *pdev)
 MODULE_ALIAS("platform:au1550-spi");
 
 static struct platform_driver au1550_spi_drv = {
+        .probe = au1550_spi_probe,
         .remove = au1550_spi_remove,
         .driver = {
                 .name = "au1550-spi",
@@ -1004,7 +1005,7 @@ static int __init au1550_spi_init(void)
                         printk(KERN_ERR "au1550-spi: cannot add memory"
                                         "dbdma device\n");
         }
-        return platform_driver_probe(&au1550_spi_drv, au1550_spi_probe);
+        return platform_driver_register(&au1550_spi_drv);
 }
 module_init(au1550_spi_init);
 
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index a6a8f0961750..9313fd3b413d 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -557,7 +557,8 @@ static struct platform_driver uwire_driver = {
                 .name           = "omap_uwire",
                 .owner          = THIS_MODULE,
         },
-        .remove         = uwire_remove,
+        .probe = uwire_probe,
+        .remove = uwire_remove,
         // suspend ... unuse ck
         // resume ... use ck
 };
@@ -579,7 +580,7 @@ static int __init omap_uwire_init(void)
                 omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);
         }
 
-        return platform_driver_probe(&uwire_driver, uwire_probe);
+        return platform_driver_register(&uwire_driver);
 }
 
 static void __exit omap_uwire_exit(void)
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 69eb88627d40..1937be437246 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -438,6 +438,7 @@ static int txx9spi_remove(struct platform_device *dev)
 MODULE_ALIAS("platform:spi_txx9");
 
 static struct platform_driver txx9spi_driver = {
+        .probe = txx9spi_probe,
         .remove = txx9spi_remove,
         .driver = {
                 .name = "spi_txx9",
@@ -447,7 +448,7 @@ static struct platform_driver txx9spi_driver = {
 
 static int __init txx9spi_init(void)
 {
-        return platform_driver_probe(&txx9spi_driver, txx9spi_probe);
+        return platform_driver_register(&txx9spi_driver);
 }
 subsys_initcall(txx9spi_init);