Commit adbb6829 authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm: Move nd_device_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_device_attribute_group and put the responsibility on the core rather
than leaf implementations to define this attribute.

For regions this creates a new nd_region_attribute_groups[] added to the
per-region device-type instances.

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: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Link: https://lore.kernel.org/r/157309901138.1582359.12909354140826530394.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent cb719d5f

arch/powerpc/platforms/pseries/papr_scm.c

+0 −2
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 


static const struct attribute_group *region_attr_groups[] = {

	&nd_region_attribute_group,

	&nd_device_attribute_group,

	&nd_mapping_attribute_group,

	&nd_numa_attribute_group,

	NULL,
@@ -299,7 +298,6 @@ static const struct attribute_group *bus_attr_groups[] = { 


static const struct attribute_group *papr_scm_dimm_groups[] = {

	&nvdimm_attribute_group,

	&nd_device_attribute_group,

	NULL,

};

drivers/acpi/nfit/core.c

+0 −2
Original line number Diff line number Diff line
@@ -1699,7 +1699,6 @@ static const struct attribute_group acpi_nfit_dimm_attribute_group = { 


static const struct attribute_group *acpi_nfit_dimm_attribute_groups[] = {

	&nvdimm_attribute_group,

	&nd_device_attribute_group,

	&acpi_nfit_dimm_attribute_group,

	NULL,

};
@@ -2199,7 +2198,6 @@ static const struct attribute_group acpi_nfit_region_attribute_group = { 
static const struct attribute_group *acpi_nfit_region_attribute_groups[] = {

	&nd_region_attribute_group,

	&nd_mapping_attribute_group,

	&nd_device_attribute_group,

	&nd_numa_attribute_group,

	&acpi_nfit_region_attribute_group,

	NULL,

drivers/nvdimm/bus.c

+1 −2
Original line number Diff line number Diff line
@@ -669,10 +669,9 @@ static struct attribute *nd_device_attributes[] = { 
/*

 * nd_device_attribute_group - generic attributes for all devices on an nd bus

 */

struct attribute_group nd_device_attribute_group = {

const struct attribute_group nd_device_attribute_group = {

	.attrs = nd_device_attributes,

};

EXPORT_SYMBOL_GPL(nd_device_attribute_group);



static ssize_t numa_node_show(struct device *dev,

		struct device_attribute *attr, char *buf)

drivers/nvdimm/dimm_devs.c

+7 −1
Original line number Diff line number Diff line
@@ -202,9 +202,15 @@ static void nvdimm_release(struct device *dev) 
	kfree(nvdimm);

}



static struct device_type nvdimm_device_type = {

static const struct attribute_group *nvdimm_attribute_groups[] = {

	&nd_device_attribute_group,

	NULL,

};



static const struct device_type nvdimm_device_type = {

	.name = "nvdimm",

	.release = nvdimm_release,

	.groups = nvdimm_attribute_groups,

};



bool is_nvdimm(struct device *dev)

drivers/nvdimm/e820.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ static const struct attribute_group *e820_pmem_attribute_groups[] = { 


static const struct attribute_group *e820_pmem_region_attribute_groups[] = {

	&nd_region_attribute_group,

	&nd_device_attribute_group,

	NULL,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE