[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220608021655.1538087-1-liuke94@huawei.com>
Date: Wed, 8 Jun 2022 02:16:55 +0000
From: Ke Liu <liuke94@...wei.com>
To: <joro@...tes.org>
CC: <will@...nel.org>, <iommu@...ts.linux-foundation.org>,
<linux-kernel@...r.kernel.org>, Ke Liu <liuke94@...wei.com>,
Jason Gunthorpe <jgg@...dia.com>,
"Michael S . Tsirkin" <mst@...hat.com>
Subject: [PATCH v2] iommu: Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove().
Signed-off-by: Ke Liu <liuke94@...wei.com>
Reviewed-by: Jason Gunthorpe <jgg@...dia.com>
Signed-off-by: Michael S. Tsirkin <mst@...hat.com>
---
v2 subject change to iommu
---
drivers/iommu/iommu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 847ad47a2dfd..cdc86c39954e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -600,7 +600,7 @@ static void iommu_group_release(struct kobject *kobj)
if (group->iommu_data_release)
group->iommu_data_release(group->iommu_data);
- ida_simple_remove(&iommu_group_ida, group->id);
+ ida_free(&iommu_group_ida, group->id);
if (group->default_domain)
iommu_domain_free(group->default_domain);
@@ -641,7 +641,7 @@ struct iommu_group *iommu_group_alloc(void)
INIT_LIST_HEAD(&group->devices);
INIT_LIST_HEAD(&group->entry);
- ret = ida_simple_get(&iommu_group_ida, 0, 0, GFP_KERNEL);
+ ret = ida_alloc(&iommu_group_ida, GFP_KERNEL);
if (ret < 0) {
kfree(group);
return ERR_PTR(ret);
@@ -651,7 +651,7 @@ struct iommu_group *iommu_group_alloc(void)
ret = kobject_init_and_add(&group->kobj, &iommu_group_ktype,
NULL, "%d", group->id);
if (ret) {
- ida_simple_remove(&iommu_group_ida, group->id);
+ ida_free(&iommu_group_ida, group->id);
kobject_put(&group->kobj);
return ERR_PTR(ret);
}
--
2.25.1
Powered by blists - more mailing lists