diff --git a/[refs] b/[refs]
index 61daf9259401..ac9cb0f73014 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0fde3ba0e03af30f9fa9cdf180442189b3f7e9c
+refs/heads/master: 41ab724aac00cae42e649496c2567e9ef45dd753
diff --git a/trunk/drivers/spi/spi-orion.c b/trunk/drivers/spi/spi-orion.c
index 6a3cdc7cfeaf..66a5f82cf138 100644
--- a/trunk/drivers/spi/spi-orion.c
+++ b/trunk/drivers/spi/spi-orion.c
@@ -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),
 	},
+	.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>");