Commit 822242e6 authored by Ke Liu's avatar Ke Liu Committed by Joerg Roedel
Browse files

iommu: Directly use ida_alloc()/free() 



Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove().

Signed-off-by: default avatarKe Liu <liuke94@huawei.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/r/20220608021655.1538087-1-liuke94@huawei.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent a111daf0

drivers/iommu/iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}