Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24278a24 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu: Remove iommu_domain_has_cap() API function 



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

drivers/iommu/iommu.c

+0 −13
Original line number Diff line number Diff line
@@ -956,19 +956,6 @@ phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) 
}

EXPORT_SYMBOL_GPL(iommu_iova_to_phys);



int iommu_domain_has_cap(struct iommu_domain *domain,

			 enum iommu_cap cap)

{

	if (domain->ops->domain_has_cap != NULL)

		return domain->ops->domain_has_cap(domain, cap);



	if (domain->ops->capable != NULL)

		return domain->ops->capable(cap);



	return 0;

}

EXPORT_SYMBOL_GPL(iommu_domain_has_cap);



static size_t iommu_pgsize(struct iommu_domain *domain,

			   unsigned long addr_merge, size_t size)

{

include/linux/iommu.h

+0 −11
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ enum iommu_attr { 
 * @map: map a physically contiguous memory region to an iommu domain

 * @unmap: unmap a physically contiguous memory region from an iommu domain

 * @iova_to_phys: translate iova to physical address

 * @domain_has_cap: domain capabilities query

 * @add_device: add device to iommu grouping

 * @remove_device: remove device from iommu grouping

 * @domain_get_attr: Query domain attributes
@@ -115,8 +114,6 @@ struct iommu_ops { 
	size_t (*unmap)(struct iommu_domain *domain, unsigned long iova,

		     size_t size);

	phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);

	int (*domain_has_cap)(struct iommu_domain *domain,

			      unsigned long cap);

	int (*add_device)(struct device *dev);

	void (*remove_device)(struct device *dev);

	int (*device_group)(struct device *dev, unsigned int *groupid);
@@ -159,8 +156,6 @@ extern int iommu_map(struct iommu_domain *domain, unsigned long iova, 
extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova,

		       size_t size);

extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova);

extern int iommu_domain_has_cap(struct iommu_domain *domain,

				enum iommu_cap cap);

extern void iommu_set_fault_handler(struct iommu_domain *domain,

			iommu_fault_handler_t handler, void *token);
@@ -314,12 +309,6 @@ static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_ad 
	return 0;

}



static inline int iommu_domain_has_cap(struct iommu_domain *domain,

				       enum iommu_cap cap)

{

	return 0;

}



static inline void iommu_set_fault_handler(struct iommu_domain *domain,

				iommu_fault_handler_t handler, void *token)

{