UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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@huawei.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/r/20220608021655.1538087-1-liuke94@huawei.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Ke Liu 2022-06-08 02:16:55 +00:00 committed by Joerg Roedel
parent a111daf0c5
commit 822242e649
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/iommu/iommu.c
View File

@ -600,7 +600,7 @@ static void iommu_group_release(struct kobject *kobj)
if (group->iommu_data_release) if (group->iommu_data_release)
group->iommu_data_release(group->iommu_data); 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) if (group->default_domain)
iommu_domain_free(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->devices);
INIT_LIST_HEAD(&group->entry); 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) { if (ret < 0) {
kfree(group); kfree(group);
return ERR_PTR(ret); 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, ret = kobject_init_and_add(&group->kobj, &iommu_group_ktype,
NULL, "%d", group->id); NULL, "%d", group->id);
if (ret) { if (ret) {
ida_simple_remove(&iommu_group_ida, group->id); ida_free(&iommu_group_ida, group->id);
kobject_put(&group->kobj); kobject_put(&group->kobj);
return ERR_PTR(ret); return ERR_PTR(ret);
} }