From: Bo Liu <liubo03@inspur.com>
Date: Thu, 16 Jun 2022 04:47:33 +0000 (-0400)
Subject: gnss: replace ida_simple API
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c0c725d7350ec8b8453257676a440bb4b2df2422;p=linux.git

gnss: replace ida_simple API

Use ida_alloc_xxx()/ida_free() instead of
ida_simple_get()/ida_simple_remove(), which has been deprecated.

Note that the upper bound is now inclusive.

Signed-off-by: Bo Liu <liubo03@inspur.com>
Link: https://lore.kernel.org/r/20220616044733.3605-1-liubo03@inspur.com
Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
[ johan: amend commit message ]
Signed-off-by: Johan Hovold <johan@kernel.org>
---

diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c
index e6f94501cb28c..1e82b7967570a 100644
--- a/drivers/gnss/core.c
+++ b/drivers/gnss/core.c
@@ -217,7 +217,7 @@ static void gnss_device_release(struct device *dev)
 
 	kfree(gdev->write_buf);
 	kfifo_free(&gdev->read_fifo);
-	ida_simple_remove(&gnss_minors, gdev->id);
+	ida_free(&gnss_minors, gdev->id);
 	kfree(gdev);
 }
 
@@ -232,7 +232,7 @@ struct gnss_device *gnss_allocate_device(struct device *parent)
 	if (!gdev)
 		return NULL;
 
-	id = ida_simple_get(&gnss_minors, 0, GNSS_MINORS, GFP_KERNEL);
+	id = ida_alloc_max(&gnss_minors, GNSS_MINORS - 1, GFP_KERNEL);
 	if (id < 0) {
 		kfree(gdev);
 		return NULL;