]> git.itanic.dy.fi Git - linux-stable/commitdiff
dmaengine: idxd: Remove usage of the deprecated ida_simple_xx() API
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 19 Dec 2023 19:33:50 +0000 (20:33 +0100)
committerVinod Koul <vkoul@kernel.org>
Thu, 21 Dec 2023 15:59:21 +0000 (21:29 +0530)
ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range() is inclusive. Sothis change allows one more device.

MINORMASK is ((1U << MINORBITS) - 1), so allowing MINORMASK as a maximum value
makes sense. It is also consistent with other "ida_.*MINORMASK" and
"ida_*MINOR()" usages.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Lijun Pan <lijun.pan@intel.com>
Link: https://lore.kernel.org/r/ac991f5f42112fa782a881d391d447529cbc4a23.1702967302.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/idxd/cdev.c

index 0423655f5a88045e2f02119f2bd112f203b011a3..b00926abc69aeea6c5fac0e06da84e4e49a279bb 100644 (file)
@@ -165,7 +165,7 @@ static void idxd_cdev_dev_release(struct device *dev)
        struct idxd_wq *wq = idxd_cdev->wq;
 
        cdev_ctx = &ictx[wq->idxd->data->type];
-       ida_simple_remove(&cdev_ctx->minor_ida, idxd_cdev->minor);
+       ida_free(&cdev_ctx->minor_ida, idxd_cdev->minor);
        kfree(idxd_cdev);
 }
 
@@ -463,7 +463,7 @@ int idxd_wq_add_cdev(struct idxd_wq *wq)
        cdev = &idxd_cdev->cdev;
        dev = cdev_dev(idxd_cdev);
        cdev_ctx = &ictx[wq->idxd->data->type];
-       minor = ida_simple_get(&cdev_ctx->minor_ida, 0, MINORMASK, GFP_KERNEL);
+       minor = ida_alloc_max(&cdev_ctx->minor_ida, MINORMASK, GFP_KERNEL);
        if (minor < 0) {
                kfree(idxd_cdev);
                return minor;