Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6

[~andy/linux] / drivers / spi / spi-mpc52xx-psc.c

diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index e30baf0852ac78bf338fd31b7869896169649d37..66047156d90dbc8d1bd9980492050629ad1f40d1 100644 (file)
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -511,18 +511,7 @@ static struct platform_driver mpc52xx_psc_spi_of_driver = {
                .of_match_table = mpc52xx_psc_spi_of_match,
        },
 };
-
-static int __init mpc52xx_psc_spi_init(void)
-{
-       return platform_driver_register(&mpc52xx_psc_spi_of_driver);
-}
-module_init(mpc52xx_psc_spi_init);
-
-static void __exit mpc52xx_psc_spi_exit(void)
-{
-       platform_driver_unregister(&mpc52xx_psc_spi_of_driver);
-}
-module_exit(mpc52xx_psc_spi_exit);
+module_platform_driver(mpc52xx_psc_spi_of_driver);
 
 MODULE_AUTHOR("Dragos Carp");
 MODULE_DESCRIPTION("MPC52xx PSC SPI Driver");