aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/nvdimm/bus.c4
-rw-r--r--drivers/nvdimm/label.c2
-rw-r--r--drivers/nvdimm/label.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 7ff684159f29..2eb6a6cfe9e4 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -642,7 +642,7 @@ static struct attribute *nd_device_attributes[] = {
642 NULL, 642 NULL,
643}; 643};
644 644
645/** 645/*
646 * nd_device_attribute_group - generic attributes for all devices on an nd bus 646 * nd_device_attribute_group - generic attributes for all devices on an nd bus
647 */ 647 */
648struct attribute_group nd_device_attribute_group = { 648struct attribute_group nd_device_attribute_group = {
@@ -671,7 +671,7 @@ static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a,
671 return a->mode; 671 return a->mode;
672} 672}
673 673
674/** 674/*
675 * nd_numa_attribute_group - NUMA attributes for all devices on an nd bus 675 * nd_numa_attribute_group - NUMA attributes for all devices on an nd bus
676 */ 676 */
677struct attribute_group nd_numa_attribute_group = { 677struct attribute_group nd_numa_attribute_group = {
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
index 2030805aa216..edf278067e72 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -25,6 +25,8 @@ static guid_t nvdimm_btt2_guid;
25static guid_t nvdimm_pfn_guid; 25static guid_t nvdimm_pfn_guid;
26static guid_t nvdimm_dax_guid; 26static guid_t nvdimm_dax_guid;
27 27
28static const char NSINDEX_SIGNATURE[] = "NAMESPACE_INDEX\0";
29
28static u32 best_seq(u32 a, u32 b) 30static u32 best_seq(u32 a, u32 b)
29{ 31{
30 a &= NSINDEX_SEQ_MASK; 32 a &= NSINDEX_SEQ_MASK;
diff --git a/drivers/nvdimm/label.h b/drivers/nvdimm/label.h
index e9a2ad3c2150..4bb7add39580 100644
--- a/drivers/nvdimm/label.h
+++ b/drivers/nvdimm/label.h
@@ -38,8 +38,6 @@ enum {
38 ND_NSINDEX_INIT = 0x1, 38 ND_NSINDEX_INIT = 0x1,
39}; 39};
40 40
41static const char NSINDEX_SIGNATURE[] = "NAMESPACE_INDEX\0";
42
43/** 41/**
44 * struct nd_namespace_index - label set superblock 42 * struct nd_namespace_index - label set superblock
45 * @sig: NAMESPACE_INDEX\0 43 * @sig: NAMESPACE_INDEX\0