Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hugepages' into linux-linaro-lsk

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

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index b7e718254b1dcb79d835cab0f0fa9c0f6705187a..66a5f82cf138d86b4fa84d5235e1086022ca6b08 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -366,7 +366,7 @@ msg_done:
        return 0;
 }
 
-static int __init orion_spi_reset(struct orion_spi *orion_spi)
+static int orion_spi_reset(struct orion_spi *orion_spi)
 {
        /* Verify that the CS is deasserted */
        orion_spi_set_cs(orion_spi, 0);
@@ -396,7 +396,7 @@ static int orion_spi_setup(struct spi_device *spi)
        return 0;
 }
 
-static int __init orion_spi_probe(struct platform_device *pdev)
+static int orion_spi_probe(struct platform_device *pdev)
 {
        struct spi_master *master;
        struct orion_spi *spi;
@@ -479,7 +479,7 @@ out:
 }
 
 
-static int __exit orion_spi_remove(struct platform_device *pdev)
+static int orion_spi_remove(struct platform_device *pdev)
 {
        struct spi_master *master;
        struct resource *r;
@@ -513,20 +513,11 @@ static struct platform_driver orion_spi_driver = {
                .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(orion_spi_of_match_table),
        },
-       .remove         = __exit_p(orion_spi_remove),
+       .probe          = orion_spi_probe,
+       .remove         = orion_spi_remove,
 };
 
-static int __init orion_spi_init(void)
-{
-       return platform_driver_probe(&orion_spi_driver, orion_spi_probe);
-}
-module_init(orion_spi_init);
-
-static void __exit orion_spi_exit(void)
-{
-       platform_driver_unregister(&orion_spi_driver);
-}
-module_exit(orion_spi_exit);
+module_platform_driver(orion_spi_driver);
 
 MODULE_DESCRIPTION("Orion SPI driver");
 MODULE_AUTHOR("Shadi Ammouri <shadi@marvell.com>");