libnvdimm, btt, convert nd_btt_probe() to devm

Pass the device performing the probe so we can use a devm allocation for
the btt superblock.

Cc: Vishal Verma <vishal.l.verma@intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 24649396b638a8348418d67bdeecf93ea79d8a93..c8215dc356cce747dea5a28308bf135aaee0fda5 100644 (file)
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -314,7 +314,7 @@ static int nd_blk_probe(struct device *dev)
        ndns->rw_bytes = nd_blk_rw_bytes;
        if (is_nd_btt(dev))
                rc = nvdimm_namespace_attach_btt(ndns);
-       else if (nd_btt_probe(ndns, blk_dev) == 0) {
+       else if (nd_btt_probe(dev, ndns, blk_dev) == 0) {
                /* we'll come back as btt-blk */
                rc = -ENXIO;
        } else

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 676c31a8fb6d20778618c6f90a2995d8e4f49b9d..cc9fafed936212fe1f7646cc698544460fcd1efb 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1306,7 +1306,7 @@ static struct btt *btt_init(struct nd_btt *nd_btt, unsigned long long rawsize,
        struct btt *btt;
        struct device *dev = &nd_btt->dev;
 
-       btt = kzalloc(sizeof(struct btt), GFP_KERNEL);
+       btt = devm_kzalloc(dev, sizeof(struct btt), GFP_KERNEL);
        if (!btt)
                return NULL;
 
@@ -1321,13 +1321,13 @@ static struct btt *btt_init(struct nd_btt *nd_btt, unsigned long long rawsize,
        ret = discover_arenas(btt);
        if (ret) {
                dev_err(dev, "init: error in arena_discover: %d\n", ret);
-               goto out_free;
+               return NULL;
        }
 
        if (btt->init_state != INIT_READY && nd_region->ro) {
                dev_info(dev, "%s is read-only, unable to init btt metadata\n",
                                dev_name(&nd_region->dev));
-               goto out_free;
+               return NULL;
        } else if (btt->init_state != INIT_READY) {
                btt->num_arenas = (rawsize / ARENA_MAX_SIZE) +
                        ((rawsize % ARENA_MAX_SIZE) ? 1 : 0);
@@ -1337,29 +1337,25 @@ static struct btt *btt_init(struct nd_btt *nd_btt, unsigned long long rawsize,
                ret = create_arenas(btt);
                if (ret) {
                        dev_info(dev, "init: create_arenas: %d\n", ret);
-                       goto out_free;
+                       return NULL;
                }
 
                ret = btt_meta_init(btt);
                if (ret) {
                        dev_err(dev, "init: error in meta_init: %d\n", ret);
-                       goto out_free;
+                       return NULL;
                }
        }
 
        ret = btt_blk_init(btt);
        if (ret) {
                dev_err(dev, "init: error in blk_init: %d\n", ret);
-               goto out_free;
+               return NULL;
        }
 
        btt_debugfs_init(btt);
 
        return btt;
-
- out_free:
-       kfree(btt);
-       return NULL;
 }
 
 /**
@@ -1377,7 +1373,6 @@ static void btt_fini(struct btt *btt)
                btt_blk_cleanup(btt);
                free_arenas(btt);
                debugfs_remove_recursive(btt->debugfs_dir);
-               kfree(btt);
        }
 }
 

diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
index cb477518dd0e4d397ede8ccc83ffe2f29ceb02a6..1886171af80e2dd506a9bc917ee546ba0de9bbb2 100644 (file)
--- a/drivers/nvdimm/btt_devs.c
+++ b/drivers/nvdimm/btt_devs.c
@@ -273,10 +273,11 @@ static int __nd_btt_probe(struct nd_btt *nd_btt,
        return 0;
 }
 
-int nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata)
+int nd_btt_probe(struct device *dev, struct nd_namespace_common *ndns,
+               void *drvdata)
 {
        int rc;
-       struct device *dev;
+       struct device *btt_dev;
        struct btt_sb *btt_sb;
        struct nd_region *nd_region = to_nd_region(ndns->dev.parent);
 
@@ -284,21 +285,20 @@ int nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata)
                return -ENODEV;
 
        nvdimm_bus_lock(&ndns->dev);
-       dev = __nd_btt_create(nd_region, 0, NULL, ndns);
+       btt_dev = __nd_btt_create(nd_region, 0, NULL, ndns);
        nvdimm_bus_unlock(&ndns->dev);
-       if (!dev)
+       if (!btt_dev)
                return -ENOMEM;
-       dev_set_drvdata(dev, drvdata);
-       btt_sb = kzalloc(sizeof(*btt_sb), GFP_KERNEL);
-       rc = __nd_btt_probe(to_nd_btt(dev), ndns, btt_sb);
-       kfree(btt_sb);
-       dev_dbg(&ndns->dev, "%s: btt: %s\n", __func__,
-                       rc == 0 ? dev_name(dev) : "<none>");
+       dev_set_drvdata(btt_dev, drvdata);
+       btt_sb = devm_kzalloc(dev, sizeof(*btt_sb), GFP_KERNEL);
+       rc = __nd_btt_probe(to_nd_btt(btt_dev), ndns, btt_sb);
+       dev_dbg(dev, "%s: btt: %s\n", __func__,
+                       rc == 0 ? dev_name(btt_dev) : "<none>");
        if (rc < 0) {
-               struct nd_btt *nd_btt = to_nd_btt(dev);
+               struct nd_btt *nd_btt = to_nd_btt(btt_dev);
 
-               __nd_detach_ndns(dev, &nd_btt->ndns);
-               put_device(dev);
+               __nd_detach_ndns(btt_dev, &nd_btt->ndns);
+               put_device(btt_dev);
        }
 
        return rc;

diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index c831caa3d60ad3e49d0c3415229cfb78738755f8..0fb14890ba26d955cf004cd0dbc40aadc6ac0a52 100644 (file)
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -197,11 +197,13 @@ struct nd_gen_sb {
 
 u64 nd_sb_checksum(struct nd_gen_sb *sb);
 #if IS_ENABLED(CONFIG_BTT)
-int nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata);
+int nd_btt_probe(struct device *dev, struct nd_namespace_common *ndns,
+               void *drvdata);
 bool is_nd_btt(struct device *dev);
 struct device *nd_btt_create(struct nd_region *nd_region);
 #else
-static inline int nd_btt_probe(struct nd_namespace_common *ndns, void *drvdata)
+static inline int nd_btt_probe(struct device *dev,
+               struct nd_namespace_common *ndns, void *drvdata)
 {
        return -ENODEV;
 }

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 4d8f5c55aade9f864bc4457825c7fc2d010def69..6fa39f55dbe33d695a1a3641d55bca0e4222c208 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -574,7 +574,7 @@ static int nd_pmem_probe(struct device *dev)
        if (is_nd_pfn(dev))
                return nvdimm_namespace_attach_pfn(ndns);
 
-       if (nd_btt_probe(ndns, pmem) == 0
+       if (nd_btt_probe(dev, ndns, pmem) == 0
                        || nd_pfn_probe(dev, ndns, pmem) == 0) {
                /*
                 * We'll come back as either btt-pmem, or pfn-pmem, so