Merge tag 'regulator-fix-v5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / nvdimm / bus.c

diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 3a777d0..e6aa870 100644 (file)
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -363,8 +363,13 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
        nvdimm_bus->dev.groups = nd_desc->attr_groups;
        nvdimm_bus->dev.bus = &nvdimm_bus_type;
        nvdimm_bus->dev.of_node = nd_desc->of_node;
-       dev_set_name(&nvdimm_bus->dev, "ndbus%d", nvdimm_bus->id);
-       rc = device_register(&nvdimm_bus->dev);
+       device_initialize(&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) {
                dev_dbg(&nvdimm_bus->dev, "registration failed: %d\n", rc);
                goto err;
@@ -396,21 +401,10 @@ static int child_unregister(struct device *dev, void *data)
        if (dev->class)
                return 0;
 
-       if (is_nvdimm(dev)) {
-               struct nvdimm *nvdimm = to_nvdimm(dev);
-               bool dev_put = false;
-
-               /* We are shutting down. Make state frozen artificially. */
-               nvdimm_bus_lock(dev);
-               set_bit(NVDIMM_SECURITY_FROZEN, &nvdimm->sec.flags);
-               if (test_and_clear_bit(NDD_WORK_PENDING, &nvdimm->flags))
-                       dev_put = true;
-               nvdimm_bus_unlock(dev);
-               cancel_delayed_work_sync(&nvdimm->dwork);
-               if (dev_put)
-                       put_device(dev);
-       }
-       nd_device_unregister(dev, ND_SYNC);
+       if (is_nvdimm(dev))
+               nvdimm_delete(to_nvdimm(dev));
+       else
+               nd_device_unregister(dev, ND_SYNC);
 
        return 0;
 }
@@ -536,6 +530,7 @@ void __nd_device_register(struct device *dev)
                set_dev_node(dev, to_nd_region(dev)->numa_node);
 
        dev->bus = &nvdimm_bus_type;
+       device_set_pm_not_required(dev);
        if (dev->parent) {
                get_device(dev->parent);
                if (dev_to_node(dev) == NUMA_NO_NODE)
@@ -728,18 +723,41 @@ const struct attribute_group nd_numa_attribute_group = {
        .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)
 {
        dev_t devt = MKDEV(nvdimm_bus_major, nvdimm_bus->id);
        struct device *dev;
+       int rc;
 
-       dev = device_create(nd_class, &nvdimm_bus->dev, devt, nvdimm_bus,
-                       "ndctl%d", nvdimm_bus->id);
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       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))
-               dev_dbg(&nvdimm_bus->dev, "failed to register ndctl%d: %ld\n",
-                               nvdimm_bus->id, PTR_ERR(dev));
-       return PTR_ERR_OR_ZERO(dev);
+       rc = device_add(dev);
+       if (rc) {
+               dev_dbg(&nvdimm_bus->dev, "failed to register ndctl%d: %d\n",
+                               nvdimm_bus->id, rc);
+               goto err;
+       }
+       return 0;
+
+err:
+       put_device(dev);
+       return rc;
 }
 
 void nvdimm_bus_destroy_ndctl(struct nvdimm_bus *nvdimm_bus)