Commit 13a78715 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'libnvdimm-for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updates from Ira Weiny:

 - One small cleanup to use sizeof(*pointer)

 - Add MODULE_DESCRIPTIONS() to eliminate make W=1 warnings

* tag 'libnvdimm-for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  testing: nvdimm: Add MODULE_DESCRIPTION() macros
  testing: nvdimm: iomap: add MODULE_DESCRIPTION()
  dax: add missing MODULE_DESCRIPTION() macros
  nvdimm: add missing MODULE_DESCRIPTION() macros
  ACPI: NFIT: add missing MODULE_DESCRIPTION() macro
  nvdimm/btt: use sizeof(*pointer) instead of sizeof(type)
parents f557af08 b0d478e3
...@@ -3531,5 +3531,6 @@ static __exit void nfit_exit(void) ...@@ -3531,5 +3531,6 @@ static __exit void nfit_exit(void)
module_init(nfit_init); module_init(nfit_init);
module_exit(nfit_exit); module_exit(nfit_exit);
MODULE_DESCRIPTION("ACPI NVDIMM Firmware Interface Table (NFIT) driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
...@@ -43,6 +43,7 @@ static struct cxl_driver cxl_dax_region_driver = { ...@@ -43,6 +43,7 @@ static struct cxl_driver cxl_dax_region_driver = {
module_cxl_driver(cxl_dax_region_driver); module_cxl_driver(cxl_dax_region_driver);
MODULE_ALIAS_CXL(CXL_DEVICE_DAX_REGION); MODULE_ALIAS_CXL(CXL_DEVICE_DAX_REGION);
MODULE_DESCRIPTION("CXL DAX: direct access to CXL regions");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
MODULE_IMPORT_NS(CXL); MODULE_IMPORT_NS(CXL);
...@@ -482,6 +482,7 @@ static void __exit dax_exit(void) ...@@ -482,6 +482,7 @@ static void __exit dax_exit(void)
} }
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
MODULE_DESCRIPTION("Device DAX: direct access device driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
module_init(dax_init); module_init(dax_init);
module_exit(dax_exit); module_exit(dax_exit);
......
...@@ -168,5 +168,6 @@ MODULE_SOFTDEP("pre: cxl_acpi"); ...@@ -168,5 +168,6 @@ MODULE_SOFTDEP("pre: cxl_acpi");
MODULE_ALIAS("platform:hmem*"); MODULE_ALIAS("platform:hmem*");
MODULE_ALIAS("platform:hmem_platform*"); MODULE_ALIAS("platform:hmem_platform*");
MODULE_DESCRIPTION("HMEM DAX: direct access to 'specific purpose' memory");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
...@@ -299,6 +299,7 @@ static void __exit dax_kmem_exit(void) ...@@ -299,6 +299,7 @@ static void __exit dax_kmem_exit(void)
} }
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
MODULE_DESCRIPTION("KMEM DAX: map dax-devices as System-RAM");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
module_init(dax_kmem_init); module_init(dax_kmem_init);
module_exit(dax_kmem_exit); module_exit(dax_kmem_exit);
......
...@@ -94,6 +94,7 @@ static void __exit dax_pmem_exit(void) ...@@ -94,6 +94,7 @@ static void __exit dax_pmem_exit(void)
} }
module_exit(dax_pmem_exit); module_exit(dax_pmem_exit);
MODULE_DESCRIPTION("PMEM DAX: direct access to persistent memory");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
MODULE_ALIAS_ND_DEVICE(ND_DEVICE_DAX_PMEM); MODULE_ALIAS_ND_DEVICE(ND_DEVICE_DAX_PMEM);
...@@ -606,6 +606,7 @@ static void __exit dax_core_exit(void) ...@@ -606,6 +606,7 @@ static void __exit dax_core_exit(void)
} }
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
MODULE_DESCRIPTION("DAX: direct access to differentiated memory");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
subsys_initcall(dax_core_init); subsys_initcall(dax_core_init);
module_exit(dax_core_exit); module_exit(dax_core_exit);
...@@ -751,7 +751,7 @@ static struct arena_info *alloc_arena(struct btt *btt, size_t size, ...@@ -751,7 +751,7 @@ static struct arena_info *alloc_arena(struct btt *btt, size_t size,
u64 logsize, mapsize, datasize; u64 logsize, mapsize, datasize;
u64 available = size; u64 available = size;
arena = kzalloc(sizeof(struct arena_info), GFP_KERNEL); arena = kzalloc(sizeof(*arena), GFP_KERNEL);
if (!arena) if (!arena)
return NULL; return NULL;
arena->nd_btt = btt->nd_btt; arena->nd_btt = btt->nd_btt;
...@@ -978,7 +978,7 @@ static int btt_arena_write_layout(struct arena_info *arena) ...@@ -978,7 +978,7 @@ static int btt_arena_write_layout(struct arena_info *arena)
if (ret) if (ret)
return ret; return ret;
super = kzalloc(sizeof(struct btt_sb), GFP_NOIO); super = kzalloc(sizeof(*super), GFP_NOIO);
if (!super) if (!super)
return -ENOMEM; return -ENOMEM;
...@@ -1716,6 +1716,7 @@ static void __exit nd_btt_exit(void) ...@@ -1716,6 +1716,7 @@ static void __exit nd_btt_exit(void)
MODULE_ALIAS_ND_DEVICE(ND_DEVICE_BTT); MODULE_ALIAS_ND_DEVICE(ND_DEVICE_BTT);
MODULE_AUTHOR("Vishal Verma <vishal.l.verma@linux.intel.com>"); MODULE_AUTHOR("Vishal Verma <vishal.l.verma@linux.intel.com>");
MODULE_DESCRIPTION("NVDIMM Block Translation Table");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
module_init(nd_btt_init); module_init(nd_btt_init);
module_exit(nd_btt_exit); module_exit(nd_btt_exit);
...@@ -540,6 +540,7 @@ static __exit void libnvdimm_exit(void) ...@@ -540,6 +540,7 @@ static __exit void libnvdimm_exit(void)
nvdimm_devs_exit(); nvdimm_devs_exit();
} }
MODULE_DESCRIPTION("NVDIMM (Non-Volatile Memory Device) core");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
subsys_initcall(libnvdimm_init); subsys_initcall(libnvdimm_init);
......
...@@ -69,5 +69,6 @@ static struct platform_driver e820_pmem_driver = { ...@@ -69,5 +69,6 @@ static struct platform_driver e820_pmem_driver = {
module_platform_driver(e820_pmem_driver); module_platform_driver(e820_pmem_driver);
MODULE_ALIAS("platform:e820_pmem*"); MODULE_ALIAS("platform:e820_pmem*");
MODULE_DESCRIPTION("NVDIMM support for e820 type-12 memory");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
...@@ -123,4 +123,5 @@ int async_pmem_flush(struct nd_region *nd_region, struct bio *bio) ...@@ -123,4 +123,5 @@ int async_pmem_flush(struct nd_region *nd_region, struct bio *bio)
return 0; return 0;
}; };
EXPORT_SYMBOL_GPL(async_pmem_flush); EXPORT_SYMBOL_GPL(async_pmem_flush);
MODULE_DESCRIPTION("Virtio Persistent Memory Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -111,5 +111,6 @@ static struct platform_driver of_pmem_region_driver = { ...@@ -111,5 +111,6 @@ static struct platform_driver of_pmem_region_driver = {
module_platform_driver(of_pmem_region_driver); module_platform_driver(of_pmem_region_driver);
MODULE_DEVICE_TABLE(of, of_pmem_region_match); MODULE_DEVICE_TABLE(of, of_pmem_region_match);
MODULE_DESCRIPTION("NVDIMM Device Tree support");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("IBM Corporation"); MODULE_AUTHOR("IBM Corporation");
...@@ -766,4 +766,5 @@ static struct nd_device_driver nd_pmem_driver = { ...@@ -766,4 +766,5 @@ static struct nd_device_driver nd_pmem_driver = {
module_nd_driver(nd_pmem_driver); module_nd_driver(nd_pmem_driver);
MODULE_AUTHOR("Ross Zwisler <ross.zwisler@linux.intel.com>"); MODULE_AUTHOR("Ross Zwisler <ross.zwisler@linux.intel.com>");
MODULE_DESCRIPTION("NVDIMM Persistent Memory Driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -407,4 +407,5 @@ union acpi_object * __wrap_acpi_evaluate_dsm(acpi_handle handle, const guid_t *g ...@@ -407,4 +407,5 @@ union acpi_object * __wrap_acpi_evaluate_dsm(acpi_handle handle, const guid_t *g
} }
EXPORT_SYMBOL(__wrap_acpi_evaluate_dsm); EXPORT_SYMBOL(__wrap_acpi_evaluate_dsm);
MODULE_DESCRIPTION("NVDIMM unit test");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
...@@ -987,5 +987,6 @@ static __exit void ndtest_exit(void) ...@@ -987,5 +987,6 @@ static __exit void ndtest_exit(void)
module_init(ndtest_init); module_init(ndtest_init);
module_exit(ndtest_exit); module_exit(ndtest_exit);
MODULE_DESCRIPTION("Test non-NFIT devices");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("IBM Corporation"); MODULE_AUTHOR("IBM Corporation");
...@@ -3382,5 +3382,6 @@ static __exit void nfit_test_exit(void) ...@@ -3382,5 +3382,6 @@ static __exit void nfit_test_exit(void)
module_init(nfit_test_init); module_init(nfit_test_init);
module_exit(nfit_test_exit); module_exit(nfit_test_exit);
MODULE_DESCRIPTION("Test ACPI NFIT devices");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment