[PATCH -next] rpmb: Remove usage of the deprecated ida_simple_xx() API

Hongbo Li posted 1 patch 1 year, 5 months ago
drivers/misc/rpmb-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[PATCH -next] rpmb: Remove usage of the deprecated ida_simple_xx() API
Posted by Hongbo Li 1 year, 5 months ago
The ida_alloc() and ida_free() should be preferred to the
deprecated ida_simple_get() and ida_simple_remove().

Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
---
 drivers/misc/rpmb-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/rpmb-core.c b/drivers/misc/rpmb-core.c
index c8888267c222..ce45ec968de1 100644
--- a/drivers/misc/rpmb-core.c
+++ b/drivers/misc/rpmb-core.c
@@ -64,7 +64,7 @@ static void rpmb_dev_release(struct device *dev)
 	struct rpmb_dev *rdev = to_rpmb_dev(dev);
 
 	mutex_lock(&rpmb_mutex);
-	ida_simple_remove(&rpmb_ida, rdev->id);
+	ida_free(&rpmb_ida, rdev->id);
 	mutex_unlock(&rpmb_mutex);
 	kfree(rdev->descr.dev_id);
 	kfree(rdev);
@@ -176,7 +176,7 @@ struct rpmb_dev *rpmb_dev_register(struct device *dev,
 	}
 
 	mutex_lock(&rpmb_mutex);
-	ret = ida_simple_get(&rpmb_ida, 0, 0, GFP_KERNEL);
+	ret = ida_alloc(&rpmb_ida, GFP_KERNEL);
 	mutex_unlock(&rpmb_mutex);
 	if (ret < 0)
 		goto err_free_dev_id;
@@ -196,7 +196,7 @@ struct rpmb_dev *rpmb_dev_register(struct device *dev,
 
 err_id_remove:
 	mutex_lock(&rpmb_mutex);
-	ida_simple_remove(&rpmb_ida, rdev->id);
+	ida_free(&rpmb_ida, rdev->id);
 	mutex_unlock(&rpmb_mutex);
 err_free_dev_id:
 	kfree(rdev->descr.dev_id);
-- 
2.34.1