libnvdimm: Move nd_numa_attribute_group to device_type
A 'struct device_type' instance can carry default attributes for the device. Use this facility to remove the export of nd_numa_attribute_group and put the responsibility on the core rather than leaf implementations to define this attribute. Cc: Ira Weiny <ira.weiny@intel.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: "Oliver O'Halloran" <oohall@gmail.com> Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Link: https://lore.kernel.org/r/157401269537.43284.14411189404186877352.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
adbb68293f
commit
e2f6a0e348
|
@ -287,7 +287,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
|
||||||
static const struct attribute_group *region_attr_groups[] = {
|
static const struct attribute_group *region_attr_groups[] = {
|
||||||
&nd_region_attribute_group,
|
&nd_region_attribute_group,
|
||||||
&nd_mapping_attribute_group,
|
&nd_mapping_attribute_group,
|
||||||
&nd_numa_attribute_group,
|
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2198,7 +2198,6 @@ static const struct attribute_group acpi_nfit_region_attribute_group = {
|
||||||
static const struct attribute_group *acpi_nfit_region_attribute_groups[] = {
|
static const struct attribute_group *acpi_nfit_region_attribute_groups[] = {
|
||||||
&nd_region_attribute_group,
|
&nd_region_attribute_group,
|
||||||
&nd_mapping_attribute_group,
|
&nd_mapping_attribute_group,
|
||||||
&nd_numa_attribute_group,
|
|
||||||
&acpi_nfit_region_attribute_group,
|
&acpi_nfit_region_attribute_group,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
|
@ -697,11 +697,10 @@ static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a,
|
||||||
/*
|
/*
|
||||||
* nd_numa_attribute_group - NUMA attributes for all devices on an nd bus
|
* nd_numa_attribute_group - NUMA attributes for all devices on an nd bus
|
||||||
*/
|
*/
|
||||||
struct attribute_group nd_numa_attribute_group = {
|
const struct attribute_group nd_numa_attribute_group = {
|
||||||
.attrs = nd_numa_attributes,
|
.attrs = nd_numa_attributes,
|
||||||
.is_visible = nd_numa_attr_visible,
|
.is_visible = nd_numa_attr_visible,
|
||||||
};
|
};
|
||||||
EXPORT_SYMBOL_GPL(nd_numa_attribute_group);
|
|
||||||
|
|
||||||
int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus)
|
int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus)
|
||||||
{
|
{
|
||||||
|
|
|
@ -240,6 +240,7 @@ void nvdimm_exit(void);
|
||||||
void nd_region_exit(void);
|
void nd_region_exit(void);
|
||||||
struct nvdimm;
|
struct nvdimm;
|
||||||
extern const struct attribute_group nd_device_attribute_group;
|
extern const struct attribute_group nd_device_attribute_group;
|
||||||
|
extern const struct attribute_group nd_numa_attribute_group;
|
||||||
struct nvdimm_drvdata *to_ndd(struct nd_mapping *nd_mapping);
|
struct nvdimm_drvdata *to_ndd(struct nd_mapping *nd_mapping);
|
||||||
int nvdimm_check_config_data(struct device *dev);
|
int nvdimm_check_config_data(struct device *dev);
|
||||||
int nvdimm_init_nsarea(struct nvdimm_drvdata *ndd);
|
int nvdimm_init_nsarea(struct nvdimm_drvdata *ndd);
|
||||||
|
|
|
@ -765,6 +765,7 @@ EXPORT_SYMBOL_GPL(nd_region_attribute_group);
|
||||||
|
|
||||||
static const struct attribute_group *nd_region_attribute_groups[] = {
|
static const struct attribute_group *nd_region_attribute_groups[] = {
|
||||||
&nd_device_attribute_group,
|
&nd_device_attribute_group,
|
||||||
|
&nd_numa_attribute_group,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,6 @@ enum {
|
||||||
|
|
||||||
extern struct attribute_group nvdimm_bus_attribute_group;
|
extern struct attribute_group nvdimm_bus_attribute_group;
|
||||||
extern struct attribute_group nvdimm_attribute_group;
|
extern struct attribute_group nvdimm_attribute_group;
|
||||||
extern struct attribute_group nd_numa_attribute_group;
|
|
||||||
extern struct attribute_group nd_region_attribute_group;
|
extern struct attribute_group nd_region_attribute_group;
|
||||||
extern struct attribute_group nd_mapping_attribute_group;
|
extern struct attribute_group nd_mapping_attribute_group;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue