Dan Williams <[email protected]> writes: > A 'struct device_type' instance can carry default attributes for the > device. Use this facility to remove the export of > nd_mapping_attribute_group and put the responsibility on the core rather > than leaf implementations to define this attribute. >
Reviewed-by: Aneesh Kumar K.V <[email protected]> > Cc: Ira Weiny <[email protected]> > Cc: Michael Ellerman <[email protected]> > Cc: "Oliver O'Halloran" <[email protected]> > Cc: Vishal Verma <[email protected]> > Cc: Aneesh Kumar K.V <[email protected]> > Signed-off-by: Dan Williams <[email protected]> > --- > arch/powerpc/platforms/pseries/papr_scm.c | 6 ------ > drivers/acpi/nfit/core.c | 1 - > drivers/nvdimm/region_devs.c | 4 ++-- > include/linux/libnvdimm.h | 1 - > 4 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/platforms/pseries/papr_scm.c > b/arch/powerpc/platforms/pseries/papr_scm.c > index 6428834d7cd5..0405fb769336 100644 > --- a/arch/powerpc/platforms/pseries/papr_scm.c > +++ b/arch/powerpc/platforms/pseries/papr_scm.c > @@ -284,11 +284,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor > *nd_desc, struct nvdimm *nvdimm, > return 0; > } > > -static const struct attribute_group *region_attr_groups[] = { > - &nd_mapping_attribute_group, > - NULL, > -}; > - > static const struct attribute_group *bus_attr_groups[] = { > &nvdimm_bus_attribute_group, > NULL, > @@ -362,7 +357,6 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) > mapping.size = p->blocks * p->block_size; // XXX: potential overflow? > > memset(&ndr_desc, 0, sizeof(ndr_desc)); > - ndr_desc.attr_groups = region_attr_groups; > target_nid = dev_to_node(&p->pdev->dev); > online_nid = papr_scm_node(target_nid); > ndr_desc.numa_node = online_nid; > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c > index 99e20b8b6ea0..69c406ecc3a6 100644 > --- a/drivers/acpi/nfit/core.c > +++ b/drivers/acpi/nfit/core.c > @@ -2196,7 +2196,6 @@ static const struct attribute_group > acpi_nfit_region_attribute_group = { > }; > > static const struct attribute_group *acpi_nfit_region_attribute_groups[] = { > - &nd_mapping_attribute_group, > &acpi_nfit_region_attribute_group, > NULL, > }; > diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c > index f97166583294..0afc1973e938 100644 > --- a/drivers/nvdimm/region_devs.c > +++ b/drivers/nvdimm/region_devs.c > @@ -751,11 +751,10 @@ static struct attribute *mapping_attributes[] = { > NULL, > }; > > -struct attribute_group nd_mapping_attribute_group = { > +static const struct attribute_group nd_mapping_attribute_group = { > .is_visible = mapping_visible, > .attrs = mapping_attributes, > }; > -EXPORT_SYMBOL_GPL(nd_mapping_attribute_group); > > static const struct attribute_group nd_region_attribute_group = { > .attrs = nd_region_attributes, > @@ -766,6 +765,7 @@ static const struct attribute_group > *nd_region_attribute_groups[] = { > &nd_device_attribute_group, > &nd_region_attribute_group, > &nd_numa_attribute_group, > + &nd_mapping_attribute_group, > NULL, > }; > > diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h > index 312248d334c7..eb597d1cb891 100644 > --- a/include/linux/libnvdimm.h > +++ b/include/linux/libnvdimm.h > @@ -67,7 +67,6 @@ enum { > > extern struct attribute_group nvdimm_bus_attribute_group; > extern struct attribute_group nvdimm_attribute_group; > -extern struct attribute_group nd_mapping_attribute_group; > > struct nvdimm; > struct nvdimm_bus_descriptor; > _______________________________________________ > Linux-nvdimm mailing list -- [email protected] > To unsubscribe send an email to [email protected] _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
