diff options
| author | Robin Murphy <robin.murphy@arm.com> | 2018-09-19 12:12:57 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2018-09-25 14:54:53 +0200 |
| commit | 701d8a624a2d5aa7d7efd38800c7c6ab4a4c453c (patch) | |
| tree | b14b7ae29159bde7c621580fd71fcb5914330ce7 /drivers/iommu/iommu.c | |
| parent | arm64/dma-mapping: Mildly optimise non-coherent IOMMU ops (diff) | |
| download | linux-701d8a624a2d5aa7d7efd38800c7c6ab4a4c453c.tar.xz linux-701d8a624a2d5aa7d7efd38800c7c6ab4a4c453c.zip | |
iommu: Tidy up window attributes
The external interface to get/set window attributes is already
abstracted behind iommu_domain_{get,set}_attr(), so there's no real
reason for the internal interface to be different. Since we only have
one window-based driver anyway, clean up the core code by just moving
the DOMAIN_ATTR_WINDOWS handling directly into the PAMU driver.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 9d70344204fe..e9b50abc02a4 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1805,7 +1805,6 @@ int iommu_domain_get_attr(struct iommu_domain *domain, struct iommu_domain_geometry *geometry; bool *paging; int ret = 0; - u32 *count; switch (attr) { case DOMAIN_ATTR_GEOMETRY: @@ -1817,15 +1816,6 @@ int iommu_domain_get_attr(struct iommu_domain *domain, paging = data; *paging = (domain->pgsize_bitmap != 0UL); break; - case DOMAIN_ATTR_WINDOWS: - count = data; - - if (domain->ops->domain_get_windows != NULL) - *count = domain->ops->domain_get_windows(domain); - else - ret = -ENODEV; - - break; default: if (!domain->ops->domain_get_attr) return -EINVAL; @@ -1841,18 +1831,8 @@ int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { int ret = 0; - u32 *count; switch (attr) { - case DOMAIN_ATTR_WINDOWS: - count = data; - - if (domain->ops->domain_set_windows != NULL) - ret = domain->ops->domain_set_windows(domain, *count); - else - ret = -ENODEV; - - break; default: if (domain->ops->domain_set_attr == NULL) return -EINVAL; |