fpga: Directly use ida_alloc()/free()

Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .

Signed-off-by: keliu <liuke94@huawei.com>
Link: https://lore.kernel.org/r/20220527085915.2798928-1-liuke94@huawei.com
Signed-off-by: Xu Yilun <yilun.xu@intel.com>

diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 6bff39f..5498bc3 100644 (file)
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -342,7 +342,7 @@ static void release_dfl_dev(struct device *dev)
        if (ddev->mmio_res.parent)
                release_resource(&ddev->mmio_res);
 
-       ida_simple_remove(&dfl_device_ida, ddev->id);
+       ida_free(&dfl_device_ida, ddev->id);
        kfree(ddev->irqs);
        kfree(ddev);
 }
@@ -360,7 +360,7 @@ dfl_dev_add(struct dfl_feature_platform_data *pdata,
        if (!ddev)
                return ERR_PTR(-ENOMEM);
 
-       id = ida_simple_get(&dfl_device_ida, 0, 0, GFP_KERNEL);
+       id = ida_alloc(&dfl_device_ida, GFP_KERNEL);
        if (id < 0) {
                dev_err(&pdev->dev, "unable to get id\n");
                kfree(ddev);

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 16f2b16..7277044 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -342,7 +342,7 @@ fpga_bridge_register(struct device *parent, const char *name,
        if (!bridge)
                return ERR_PTR(-ENOMEM);
 
-       id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL);
+       id = ida_alloc(&fpga_bridge_ida, GFP_KERNEL);
        if (id < 0) {
                ret = id;
                goto error_kfree;
@@ -375,7 +375,7 @@ fpga_bridge_register(struct device *parent, const char *name,
        return bridge;
 
 error_device:
-       ida_simple_remove(&fpga_bridge_ida, id);
+       ida_free(&fpga_bridge_ida, id);
 error_kfree:
        kfree(bridge);
 
@@ -407,7 +407,7 @@ static void fpga_bridge_dev_release(struct device *dev)
 {
        struct fpga_bridge *bridge = to_fpga_bridge(dev);
 
-       ida_simple_remove(&fpga_bridge_ida, bridge->dev.id);
+       ida_free(&fpga_bridge_ida, bridge->dev.id);
        kfree(bridge);
 }
 

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index a3595ec..08dc85f 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);
 }
 

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 485948e..27ff9de 100644 (file)
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -202,7 +202,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info *
        if (!region)
                return ERR_PTR(-ENOMEM);
 
-       id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL);
+       id = ida_alloc(&fpga_region_ida, GFP_KERNEL);
        if (id < 0) {
                ret = id;
                goto err_free;
@@ -234,7 +234,7 @@ fpga_region_register_full(struct device *parent, const struct fpga_region_info *
        return region;
 
 err_remove:
-       ida_simple_remove(&fpga_region_ida, id);
+       ida_free(&fpga_region_ida, id);
 err_free:
        kfree(region);
 
@@ -283,7 +283,7 @@ static void fpga_region_dev_release(struct device *dev)
 {
        struct fpga_region *region = to_fpga_region(dev);
 
-       ida_simple_remove(&fpga_region_ida, region->dev.id);
+       ida_free(&fpga_region_ida, region->dev.id);
        kfree(region);
 }