Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nvdimm: Remove usage of the deprecated ida_simple_xx() API

Browse Source 
ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/50719568e4108f65f3b989ba05c1563e17afba3f.1702228319.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
This commit is contained in:
Christophe JAILLET 2023-12-10 18:13:09 +01:00 committed by Ira Weiny
parent f7e2910fce
commit deb369e082
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nvdimm/btt_devs.c
View File

@ -19,7 +19,7 @@ static void nd_btt_release(struct device *dev)
dev_dbg(dev, "trace\n"); dev_dbg(dev, "trace\n");
nd_detach_ndns(&nd_btt->dev, &nd_btt->ndns); nd_detach_ndns(&nd_btt->dev, &nd_btt->ndns);
ida_simple_remove(&nd_region->btt_ida, nd_btt->id); ida_free(&nd_region->btt_ida, nd_btt->id);
kfree(nd_btt->uuid); kfree(nd_btt->uuid);
kfree(nd_btt); kfree(nd_btt);
} }
@ -191,7 +191,7 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
if (!nd_btt) if (!nd_btt)
return NULL; return NULL;
nd_btt->id = ida_simple_get(&nd_region->btt_ida, 0, 0, GFP_KERNEL); nd_btt->id = ida_alloc(&nd_region->btt_ida, GFP_KERNEL);
if (nd_btt->id < 0) if (nd_btt->id < 0)
goto out_nd_btt; goto out_nd_btt;
@ -217,7 +217,7 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
return dev; return dev;
out_put_id: out_put_id:
ida_simple_remove(&nd_region->btt_ida, nd_btt->id); ida_free(&nd_region->btt_ida, nd_btt->id);
out_nd_btt: out_nd_btt:
kfree(nd_btt); kfree(nd_btt);

4
drivers/nvdimm/bus.c
View File

@ -285,7 +285,7 @@ static void nvdimm_bus_release(struct device *dev)
struct nvdimm_bus *nvdimm_bus; struct nvdimm_bus *nvdimm_bus;
nvdimm_bus = container_of(dev, struct nvdimm_bus, dev); nvdimm_bus = container_of(dev, struct nvdimm_bus, dev);
ida_simple_remove(&nd_ida, nvdimm_bus->id); ida_free(&nd_ida, nvdimm_bus->id);
kfree(nvdimm_bus); kfree(nvdimm_bus);
} }
@ -342,7 +342,7 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
INIT_LIST_HEAD(&nvdimm_bus->list); INIT_LIST_HEAD(&nvdimm_bus->list);
INIT_LIST_HEAD(&nvdimm_bus->mapping_list); INIT_LIST_HEAD(&nvdimm_bus->mapping_list);
init_waitqueue_head(&nvdimm_bus->wait); init_waitqueue_head(&nvdimm_bus->wait);
nvdimm_bus->id = ida_simple_get(&nd_ida, 0, 0, GFP_KERNEL); nvdimm_bus->id = ida_alloc(&nd_ida, GFP_KERNEL);
if (nvdimm_bus->id < 0) { if (nvdimm_bus->id < 0) {
kfree(nvdimm_bus); kfree(nvdimm_bus);
return NULL; return NULL;

4
drivers/nvdimm/dax_devs.c
View File

@ -18,7 +18,7 @@ static void nd_dax_release(struct device *dev)
dev_dbg(dev, "trace\n"); dev_dbg(dev, "trace\n");
nd_detach_ndns(dev, &nd_pfn->ndns); nd_detach_ndns(dev, &nd_pfn->ndns);
ida_simple_remove(&nd_region->dax_ida, nd_pfn->id); ida_free(&nd_region->dax_ida, nd_pfn->id);
kfree(nd_pfn->uuid); kfree(nd_pfn->uuid);
kfree(nd_dax); kfree(nd_dax);
} }
@ -55,7 +55,7 @@ static struct nd_dax *nd_dax_alloc(struct nd_region *nd_region)
return NULL; return NULL;
nd_pfn = &nd_dax->nd_pfn; nd_pfn = &nd_dax->nd_pfn;
nd_pfn->id = ida_simple_get(&nd_region->dax_ida, 0, 0, GFP_KERNEL); nd_pfn->id = ida_alloc(&nd_region->dax_ida, GFP_KERNEL);
if (nd_pfn->id < 0) { if (nd_pfn->id < 0) {
kfree(nd_dax); kfree(nd_dax);
return NULL; return NULL;

4
drivers/nvdimm/dimm_devs.c
View File

@ -194,7 +194,7 @@ static void nvdimm_release(struct device *dev)
{ {
struct nvdimm *nvdimm = to_nvdimm(dev); struct nvdimm *nvdimm = to_nvdimm(dev);
ida_simple_remove(&dimm_ida, nvdimm->id); ida_free(&dimm_ida, nvdimm->id);
kfree(nvdimm); kfree(nvdimm);
} }
@ -592,7 +592,7 @@ struct nvdimm *__nvdimm_create(struct nvdimm_bus *nvdimm_bus,
if (!nvdimm) if (!nvdimm)
return NULL; return NULL;
nvdimm->id = ida_simple_get(&dimm_ida, 0, 0, GFP_KERNEL); nvdimm->id = ida_alloc(&dimm_ida, GFP_KERNEL);
if (nvdimm->id < 0) { if (nvdimm->id < 0) {
kfree(nvdimm); kfree(nvdimm);
return NULL; return NULL;

7
drivers/nvdimm/namespace_devs.c
View File

@ -27,7 +27,7 @@ static void namespace_pmem_release(struct device *dev)
struct nd_region *nd_region = to_nd_region(dev->parent); struct nd_region *nd_region = to_nd_region(dev->parent);
if (nspm->id >= 0) if (nspm->id >= 0)
ida_simple_remove(&nd_region->ns_ida, nspm->id); ida_free(&nd_region->ns_ida, nspm->id);
kfree(nspm->alt_name); kfree(nspm->alt_name);
kfree(nspm->uuid); kfree(nspm->uuid);
kfree(nspm); kfree(nspm);
@ -1810,7 +1810,7 @@ static struct device *nd_namespace_pmem_create(struct nd_region *nd_region)
res->name = dev_name(&nd_region->dev); res->name = dev_name(&nd_region->dev);
res->flags = IORESOURCE_MEM; res->flags = IORESOURCE_MEM;
nspm->id = ida_simple_get(&nd_region->ns_ida, 0, 0, GFP_KERNEL); nspm->id = ida_alloc(&nd_region->ns_ida, GFP_KERNEL);
if (nspm->id < 0) { if (nspm->id < 0) {
kfree(nspm); kfree(nspm);
return NULL; return NULL;
@ -2188,8 +2188,7 @@ int nd_region_register_namespaces(struct nd_region *nd_region, int *err)
struct nd_namespace_pmem *nspm; struct nd_namespace_pmem *nspm;
nspm = to_nd_namespace_pmem(dev); nspm = to_nd_namespace_pmem(dev);
id = ida_simple_get(&nd_region->ns_ida, 0, 0, id = ida_alloc(&nd_region->ns_ida, GFP_KERNEL);
GFP_KERNEL);
nspm->id = id; nspm->id = id;
} else } else
id = i; id = i;

4
drivers/nvdimm/pfn_devs.c
View File

@ -22,7 +22,7 @@ static void nd_pfn_release(struct device *dev)
dev_dbg(dev, "trace\n"); dev_dbg(dev, "trace\n");
nd_detach_ndns(&nd_pfn->dev, &nd_pfn->ndns); nd_detach_ndns(&nd_pfn->dev, &nd_pfn->ndns);
ida_simple_remove(&nd_region->pfn_ida, nd_pfn->id); ida_free(&nd_region->pfn_ida, nd_pfn->id);
kfree(nd_pfn->uuid); kfree(nd_pfn->uuid);
kfree(nd_pfn); kfree(nd_pfn);
} }
@ -326,7 +326,7 @@ static struct nd_pfn *nd_pfn_alloc(struct nd_region *nd_region)
if (!nd_pfn) if (!nd_pfn)
return NULL; return NULL;
nd_pfn->id = ida_simple_get(&nd_region->pfn_ida, 0, 0, GFP_KERNEL); nd_pfn->id = ida_alloc(&nd_region->pfn_ida, GFP_KERNEL);
if (nd_pfn->id < 0) { if (nd_pfn->id < 0) {
kfree(nd_pfn); kfree(nd_pfn);
return NULL; return NULL;