openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libnvdimm: Drop unused device power management support 

LIBNVDIMM device objects register sysfs power attributes despite nothing
requiring that support. Clean up sysfs remove the power/ attribute
group. This requires a device_create() and a device_register() usage to
be converted to the device_initialize() + device_add() pattern.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/162379910795.2993820.10130417680551632288.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2021-06-15 16:18:28 -07:00
parent fd14602d05
commit 2bbafda405
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/nvdimm/bus.c
View File

@ -363,8 +363,13 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
nvdimm_bus->dev.groups = nd_desc->attr_groups; nvdimm_bus->dev.groups = nd_desc->attr_groups;
nvdimm_bus->dev.bus = &nvdimm_bus_type; nvdimm_bus->dev.bus = &nvdimm_bus_type;
nvdimm_bus->dev.of_node = nd_desc->of_node; nvdimm_bus->dev.of_node = nd_desc->of_node;
dev_set_name(&nvdimm_bus->dev, "ndbus%d", nvdimm_bus->id); device_initialize(&nvdimm_bus->dev);
rc = device_register(&nvdimm_bus->dev); device_set_pm_not_required(&nvdimm_bus->dev);
rc = dev_set_name(&nvdimm_bus->dev, "ndbus%d", nvdimm_bus->id);
if (rc)
goto err;
rc = device_add(&nvdimm_bus->dev);
if (rc) { if (rc) {
dev_dbg(&nvdimm_bus->dev, "registration failed: %d\n", rc); dev_dbg(&nvdimm_bus->dev, "registration failed: %d\n", rc);
goto err; goto err;
@ -525,6 +530,7 @@ void __nd_device_register(struct device *dev)
set_dev_node(dev, to_nd_region(dev)->numa_node); set_dev_node(dev, to_nd_region(dev)->numa_node);
dev->bus = &nvdimm_bus_type; dev->bus = &nvdimm_bus_type;
device_set_pm_not_required(dev);
if (dev->parent) { if (dev->parent) {
get_device(dev->parent); get_device(dev->parent);
if (dev_to_node(dev) == NUMA_NO_NODE) if (dev_to_node(dev) == NUMA_NO_NODE)
@ -717,18 +723,41 @@ const struct attribute_group nd_numa_attribute_group = {
.is_visible = nd_numa_attr_visible, .is_visible = nd_numa_attr_visible,
}; };
static void ndctl_release(struct device *dev)
{
kfree(dev);
}
int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus) int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus)
{ {
dev_t devt = MKDEV(nvdimm_bus_major, nvdimm_bus->id); dev_t devt = MKDEV(nvdimm_bus_major, nvdimm_bus->id);
struct device *dev; struct device *dev;
int rc;
dev = device_create(nd_class, &nvdimm_bus->dev, devt, nvdimm_bus, dev = kzalloc(sizeof(*dev), GFP_KERNEL);
"ndctl%d", nvdimm_bus->id); if (!dev)
return -ENOMEM;
device_initialize(dev);
device_set_pm_not_required(dev);
dev->class = nd_class;
dev->parent = &nvdimm_bus->dev;
dev->devt = devt;
dev->release = ndctl_release;
rc = dev_set_name(dev, "ndctl%d", nvdimm_bus->id);
if (rc)
goto err;
if (IS_ERR(dev)) rc = device_add(dev);
dev_dbg(&nvdimm_bus->dev, "failed to register ndctl%d: %ld\n", if (rc) {
nvdimm_bus->id, PTR_ERR(dev)); dev_dbg(&nvdimm_bus->dev, "failed to register ndctl%d: %d\n",
return PTR_ERR_OR_ZERO(dev); nvdimm_bus->id, rc);
goto err;
}
return 0;
err:
put_device(dev);
return rc;
} }
void nvdimm_bus_destroy_ndctl(struct nvdimm_bus *nvdimm_bus) void nvdimm_bus_destroy_ndctl(struct nvdimm_bus *nvdimm_bus)