Merge tag 'gnss-6.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan...

Johan writes:
  "GNSS updates for 6.1-rc1

   Here are the GNSS updates for 6.1-rc1, which includes a single IDA API
   cleanup.

   Everything has been in linux-next with no reported issues."

* tag 'gnss-6.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss:
  gnss: replace ida_simple API

diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c
index e6f9450..1e82b79 100644 (file)
--- 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;