Commit a66c5dc5 authored by Thierry Reding's avatar Thierry Reding Committed by Joerg Roedel
Browse files

iommu: arm: Use generic_iommu_put_resv_regions() 



Use the new standard function instead of open-coding it.

Cc: Will Deacon <will@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent f9f6971e

drivers/iommu/arm-smmu-v3.c

+1 −10
Original line number Diff line number Diff line
@@ -2710,15 +2710,6 @@ static void arm_smmu_get_resv_regions(struct device *dev, 
	iommu_dma_get_resv_regions(dev, head);

}



static void arm_smmu_put_resv_regions(struct device *dev,

				      struct list_head *head)

{

	struct iommu_resv_region *entry, *next;



	list_for_each_entry_safe(entry, next, head, list)

		kfree(entry);

}



static struct iommu_ops arm_smmu_ops = {

	.capable		= arm_smmu_capable,

	.domain_alloc		= arm_smmu_domain_alloc,
@@ -2736,7 +2727,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.domain_set_attr	= arm_smmu_domain_set_attr,

	.of_xlate		= arm_smmu_of_xlate,

	.get_resv_regions	= arm_smmu_get_resv_regions,

	.put_resv_regions	= arm_smmu_put_resv_regions,

	.put_resv_regions	= generic_iommu_put_resv_regions,

	.pgsize_bitmap		= -1UL, /* Restricted during device attach */

};

drivers/iommu/arm-smmu.c

+1 −10
Original line number Diff line number Diff line
@@ -1576,15 +1576,6 @@ static void arm_smmu_get_resv_regions(struct device *dev, 
	iommu_dma_get_resv_regions(dev, head);

}



static void arm_smmu_put_resv_regions(struct device *dev,

				      struct list_head *head)

{

	struct iommu_resv_region *entry, *next;



	list_for_each_entry_safe(entry, next, head, list)

		kfree(entry);

}



static struct iommu_ops arm_smmu_ops = {

	.capable		= arm_smmu_capable,

	.domain_alloc		= arm_smmu_domain_alloc,
@@ -1602,7 +1593,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.domain_set_attr	= arm_smmu_domain_set_attr,

	.of_xlate		= arm_smmu_of_xlate,

	.get_resv_regions	= arm_smmu_get_resv_regions,

	.put_resv_regions	= arm_smmu_put_resv_regions,

	.put_resv_regions	= generic_iommu_put_resv_regions,

	.pgsize_bitmap		= -1UL, /* Restricted during device attach */

};