Merge 5.19-rc4 into char-misc-next

[J-linux.git] / drivers / fpga / fpga-mgr.c

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index a3595ecc3f79f68b939af722742aeded3a8fe8de..08dc85fcd511213bffa1a178b3594497c045b6d8 100644 (file)
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -623,7 +623,7 @@ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *in
        if (!mgr)
                return ERR_PTR(-ENOMEM);
 
-       id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
+       id = ida_alloc(&fpga_mgr_ida, GFP_KERNEL);
        if (id < 0) {
                ret = id;
                goto error_kfree;
@@ -662,7 +662,7 @@ fpga_mgr_register_full(struct device *parent, const struct fpga_manager_info *in
        return mgr;
 
 error_device:
-       ida_simple_remove(&fpga_mgr_ida, id);
+       ida_free(&fpga_mgr_ida, id);
 error_kfree:
        kfree(mgr);
 
@@ -790,7 +790,7 @@ static void fpga_mgr_dev_release(struct device *dev)
 {
        struct fpga_manager *mgr = to_fpga_manager(dev);
 
-       ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
+       ida_free(&fpga_mgr_ida, mgr->dev.id);
        kfree(mgr);
 }