Commit d1c8e0c5 authored by Sajjan, Vikas C's avatar Sajjan, Vikas C Committed by Dan Williams

dax: use devm_add_action_or_reset()

If devm_add_action() fails, we are explicitly calling the cleanup to free
the resources allocated. Use the helper devm_add_action_or_reset()
and return directly in case of error, since the cleanup function
has been already called by the helper if there was any error.
Reported-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarVikas C Sajjan <vikas.cha.sajjan@hpe.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d932dd2c
...@@ -211,11 +211,9 @@ int devm_create_dax_dev(struct dax_region *dax_region, struct resource *res, ...@@ -211,11 +211,9 @@ int devm_create_dax_dev(struct dax_region *dax_region, struct resource *res,
} }
dax_dev->dev = dev; dax_dev->dev = dev;
rc = devm_add_action(dax_region->dev, unregister_dax_dev, dev); rc = devm_add_action_or_reset(dax_region->dev, unregister_dax_dev, dev);
if (rc) { if (rc)
unregister_dax_dev(dev);
return rc; return rc;
}
return 0; return 0;
......
...@@ -102,21 +102,19 @@ static int dax_pmem_probe(struct device *dev) ...@@ -102,21 +102,19 @@ static int dax_pmem_probe(struct device *dev)
if (rc) if (rc)
return rc; return rc;
rc = devm_add_action(dev, dax_pmem_percpu_exit, &dax_pmem->ref); rc = devm_add_action_or_reset(dev, dax_pmem_percpu_exit,
if (rc) { &dax_pmem->ref);
dax_pmem_percpu_exit(&dax_pmem->ref); if (rc)
return rc; return rc;
}
addr = devm_memremap_pages(dev, &res, &dax_pmem->ref, altmap); addr = devm_memremap_pages(dev, &res, &dax_pmem->ref, altmap);
if (IS_ERR(addr)) if (IS_ERR(addr))
return PTR_ERR(addr); return PTR_ERR(addr);
rc = devm_add_action(dev, dax_pmem_percpu_kill, &dax_pmem->ref); rc = devm_add_action_or_reset(dev, dax_pmem_percpu_kill,
if (rc) { &dax_pmem->ref);
dax_pmem_percpu_kill(&dax_pmem->ref); if (rc)
return rc; return rc;
}
nd_region = to_nd_region(dev->parent); nd_region = to_nd_region(dev->parent);
dax_region = alloc_dax_region(dev, nd_region->id, &res, dax_region = alloc_dax_region(dev, nd_region->id, &res,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment