mm/memory-failure.c: move set_migratetype_isolate() outside get_any_page()

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-omap-uwire.c

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index a6a8f09617508aeaf5a4ac3631d8914d26f38807..9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d 100644 (file)
--- 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)