Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion...

[karo-tx-linux.git] / drivers / nvdimm / e820.c

diff --git a/drivers/nvdimm/e820.c b/drivers/nvdimm/e820.c
index 11ea90120542dcbec8410147efca7a502eea9a77..6f9a6ffd7cde25f3e4714b2035eb519db1099fd8 100644 (file)
--- a/drivers/nvdimm/e820.c
+++ b/drivers/nvdimm/e820.c
@@ -84,18 +84,8 @@ static struct platform_driver e820_pmem_driver = {
        },
 };
 
-static __init int e820_pmem_init(void)
-{
-       return platform_driver_register(&e820_pmem_driver);
-}
-
-static __exit void e820_pmem_exit(void)
-{
-       platform_driver_unregister(&e820_pmem_driver);
-}
+module_platform_driver(e820_pmem_driver);
 
 MODULE_ALIAS("platform:e820_pmem*");
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Intel Corporation");
-module_init(e820_pmem_init);
-module_exit(e820_pmem_exit);