diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-12-18 02:08:10 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-12-18 02:08:10 +0300 |
commit | c44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch) | |
tree | c97d8cab54f9d62faa5a5713298418ab93a452e0 /drivers/nvdimm/e820.c | |
parent | 325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c (diff) | |
parent | d7fe1a67f658b50ec98ee1afb86df7b35c2b2593 (diff) | |
download | linux-c44ef859ceff45db1c72f9ccbfae96843c4b1501.tar.xz |
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/e820.c')
-rw-r--r-- | drivers/nvdimm/e820.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/nvdimm/e820.c b/drivers/nvdimm/e820.c index 11ea90120542..6f9a6ffd7cde 100644 --- 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); |