summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-03-26 13:43:19 +0100
committerJoerg Roedel <jroedel@suse.de>2015-03-31 15:32:16 +0200
commit89be34a1ced886880a3219f9d2ba2192dc738ef2 (patch)
tree32061686710be5bd6410ecf6bd1567b5960cd834 /drivers/iommu
parent8d4bfe40bd001c49caa9079541ff25522e7ed55d (diff)
iommu: Remove domain_init and domain_free iommu_ops
All drivers have been converted to the new domain_alloc and domain_free iommu-ops. So remove the old ones and get rid of iommu_domain->priv too, as this is no longer needed when the struct iommu_domain is embedded in the private structures of the iommu drivers. Tested-by: Thierry Reding <treding@nvidia.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Alex Williamson <alex.williamson@redhat.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/iommu.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 656b9499e748..d4f527e56679 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -900,51 +900,25 @@ EXPORT_SYMBOL_GPL(iommu_set_fault_handler);
struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{
- const struct iommu_ops *ops;
struct iommu_domain *domain;
if (bus == NULL || bus->iommu_ops == NULL)
return NULL;
- ops = bus->iommu_ops;
-
- if (ops->domain_alloc)
- domain = ops->domain_alloc(IOMMU_DOMAIN_UNMANAGED);
- else
- domain = kzalloc(sizeof(*domain), GFP_KERNEL);
-
+ domain = bus->iommu_ops->domain_alloc(IOMMU_DOMAIN_UNMANAGED);
if (!domain)
return NULL;
domain->ops = bus->iommu_ops;
domain->type = IOMMU_DOMAIN_UNMANAGED;
- if (ops->domain_init && domain->ops->domain_init(domain))
- goto out_free;
-
return domain;
-
-out_free:
- if (ops->domain_free)
- ops->domain_free(domain);
- else
- kfree(domain);
-
- return NULL;
}
EXPORT_SYMBOL_GPL(iommu_domain_alloc);
void iommu_domain_free(struct iommu_domain *domain)
{
- const struct iommu_ops *ops = domain->ops;
-
- if (likely(ops->domain_destroy != NULL))
- ops->domain_destroy(domain);
-
- if (ops->domain_free)
- ops->domain_free(domain);
- else
- kfree(domain);
+ domain->ops->domain_free(domain);
}
EXPORT_SYMBOL_GPL(iommu_domain_free);