Dan Williams <dan.j.williams@xxxxxxxxx> writes:
> A 'struct device_type' instance can carry default attributes for the
> device. Use this facility to remove the export of
> nvdimm_attribute_group and put the responsibility on the core rather
> than leaf implementations to define this attribute.
>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx>
> Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> Cc: "Oliver O'Halloran" <oohall@xxxxxxxxx>
> Cc: Vishal Verma <vishal.l.verma@xxxxxxxxx>
> Cc: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx>
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
> ---
> arch/powerpc/platforms/pseries/papr_scm.c | 9 ++-----
> drivers/acpi/nfit/core.c | 1 -
> drivers/nvdimm/dimm_devs.c | 36 +++++++++++++++--------------
> include/linux/libnvdimm.h | 1 -
> 4 files changed, 20 insertions(+), 27 deletions(-)
>
> diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c
> index 0405fb769336..8354737ac340 100644
> --- a/arch/powerpc/platforms/pseries/papr_scm.c
> +++ b/arch/powerpc/platforms/pseries/papr_scm.c
> @@ -289,11 +289,6 @@ static const struct attribute_group *bus_attr_groups[] = {
> NULL,
> };
>
> -static const struct attribute_group *papr_scm_dimm_groups[] = {
> - &nvdimm_attribute_group,
> - NULL,
> -};
> -
> static inline int papr_scm_node(int node)
> {
> int min_dist = INT_MAX, dist;
> @@ -339,8 +334,8 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)
> dimm_flags = 0;
> set_bit(NDD_ALIASING, &dimm_flags);
>
> - p->nvdimm = nvdimm_create(p->bus, p, papr_scm_dimm_groups,
> - dimm_flags, PAPR_SCM_DIMM_CMD_MASK, 0, NULL);
> + p->nvdimm = nvdimm_create(p->bus, p, NULL, dimm_flags,
> + PAPR_SCM_DIMM_CMD_MASK, 0, NULL);
> if (!p->nvdimm) {
> dev_err(dev, "Error creating DIMM object for %pOF\n", p->dn);
> goto err;
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 69c406ecc3a6..84fc1f865802 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -1698,7 +1698,6 @@ static const struct attribute_group acpi_nfit_dimm_attribute_group = {
> };
>
> static const struct attribute_group *acpi_nfit_dimm_attribute_groups[] = {
> - &nvdimm_attribute_group,
> &acpi_nfit_dimm_attribute_group,
> NULL,
> };
> diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
> index 278867c68682..94ea6dba6b4f 100644
> --- a/drivers/nvdimm/dimm_devs.c
> +++ b/drivers/nvdimm/dimm_devs.c
> @@ -202,22 +202,6 @@ static void nvdimm_release(struct device *dev)
> kfree(nvdimm);
> }
>
> -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)
> -{
> - return dev->type == &nvdimm_device_type;
> -}
> -
> struct nvdimm *to_nvdimm(struct device *dev)
> {
> struct nvdimm *nvdimm = container_of(dev, struct nvdimm, dev);
> @@ -456,11 +440,27 @@ static umode_t nvdimm_visible(struct kobject *kobj, struct attribute *a, int n)
> return 0;
> }
>
> -struct attribute_group nvdimm_attribute_group = {
> +static const struct attribute_group nvdimm_attribute_group = {
> .attrs = nvdimm_attributes,
> .is_visible = nvdimm_visible,
> };
> -EXPORT_SYMBOL_GPL(nvdimm_attribute_group);
> +
> +static const struct attribute_group *nvdimm_attribute_groups[] = {
> + &nd_device_attribute_group,
> + &nvdimm_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)
> +{
> + return dev->type == &nvdimm_device_type;
> +}
>
> struct nvdimm *__nvdimm_create(struct nvdimm_bus *nvdimm_bus,
> void *provider_data, const struct attribute_group **groups,
> diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
> index eb597d1cb891..3644af97bcb4 100644
> --- a/include/linux/libnvdimm.h
> +++ b/include/linux/libnvdimm.h
> @@ -66,7 +66,6 @@ enum {
> };
>
> extern struct attribute_group nvdimm_bus_attribute_group;
> -extern struct attribute_group nvdimm_attribute_group;
>
> struct nvdimm;
> struct nvdimm_bus_descriptor;
> _______________________________________________
> Linux-nvdimm mailing list -- linux-nvdimm@xxxxxxxxxxxx
> To unsubscribe send an email to linux-nvdimm-leave@xxxxxxxxxxxx
