virtio-blk: replace ida_simple[get|remove] with ida_[alloc_range|free]

ida_simple[get|remove] are deprecated, and are just wrappers to
ida_[alloc_range|free]. Replace ida_simple[get|remove] with their
corresponding counterparts.

No functional changes.

Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Link: https://lore.kernel.org/r/20221130123001.25473-1-p.raghav@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 19da5defd7348d4c32bd0324062abec7f00f2b08..68bd2f7961b3f5ad7d64843f2fbc659984cd3c92 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -512,7 +512,7 @@ static void virtblk_free_disk(struct gendisk *disk)
 {
        struct virtio_blk *vblk = disk->private_data;
 
-       ida_simple_remove(&vd_index_ida, vblk->index);
+       ida_free(&vd_index_ida, vblk->index);
        mutex_destroy(&vblk->vdev_mutex);
        kfree(vblk);
 }
@@ -902,8 +902,8 @@ static int virtblk_probe(struct virtio_device *vdev)
                return -EINVAL;
        }
 
-       err = ida_simple_get(&vd_index_ida, 0, minor_to_index(1 << MINORBITS),
-                            GFP_KERNEL);
+       err = ida_alloc_range(&vd_index_ida, 0,
+                             minor_to_index(1 << MINORBITS) - 1, GFP_KERNEL);
        if (err < 0)
                goto out;
        index = err;
@@ -1163,7 +1163,7 @@ out_free_vq:
 out_free_vblk:
        kfree(vblk);
 out_free_index:
-       ida_simple_remove(&vd_index_ida, index);
+       ida_free(&vd_index_ida, index);
 out:
        return err;
 }