git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-21 04:53:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

iommu: Remove domain_init and domain_free iommu_ops

Browse Source 
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>
This commit is contained in:
Joerg Roedel
2015-03-26 13:43:19 +01:00
parent 8d4bfe40bd
commit 89be34a1ce
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/iommu/iommu.c
View File

@@ -900,51 +900,25 @@ EXPORT_SYMBOL_GPL(iommu_set_fault_handler);
struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{ {
const struct iommu_ops *ops;
struct iommu_domain *domain; struct iommu_domain *domain;
if (bus == NULL || bus->iommu_ops == NULL) if (bus == NULL || bus->iommu_ops == NULL)
return NULL; return NULL;
ops = bus->iommu_ops; domain = bus->iommu_ops->domain_alloc(IOMMU_DOMAIN_UNMANAGED);
if (ops->domain_alloc)
domain = ops->domain_alloc(IOMMU_DOMAIN_UNMANAGED);
else
domain = kzalloc(sizeof(*domain), GFP_KERNEL);
if (!domain) if (!domain)
return NULL; return NULL;
domain->ops = bus->iommu_ops; domain->ops = bus->iommu_ops;
domain->type = IOMMU_DOMAIN_UNMANAGED; domain->type = IOMMU_DOMAIN_UNMANAGED;
if (ops->domain_init && domain->ops->domain_init(domain))
goto out_free;
return domain; return domain;
out_free:
if (ops->domain_free)
ops->domain_free(domain);
else
kfree(domain);
return NULL;
} }
EXPORT_SYMBOL_GPL(iommu_domain_alloc); EXPORT_SYMBOL_GPL(iommu_domain_alloc);
void iommu_domain_free(struct iommu_domain *domain) void iommu_domain_free(struct iommu_domain *domain)
{ {
const struct iommu_ops *ops = domain->ops; domain->ops->domain_free(domain);
if (likely(ops->domain_destroy != NULL))
ops->domain_destroy(domain);
if (ops->domain_free)
ops->domain_free(domain);
else
kfree(domain);
} }
EXPORT_SYMBOL_GPL(iommu_domain_free); EXPORT_SYMBOL_GPL(iommu_domain_free);

3
include/linux/iommu.h
View File

@@ -78,7 +78,6 @@ struct iommu_domain_geometry {
struct iommu_domain { struct iommu_domain {
unsigned type; unsigned type;
const struct iommu_ops *ops; const struct iommu_ops *ops;
void *priv;
iommu_fault_handler_t handler; iommu_fault_handler_t handler;
void *handler_token; void *handler_token;
struct iommu_domain_geometry geometry; struct iommu_domain_geometry geometry;
@@ -138,8 +137,6 @@ enum iommu_attr {
*/ */
struct iommu_ops { struct iommu_ops {
bool (*capable)(enum iommu_cap); bool (*capable)(enum iommu_cap);
int (*domain_init)(struct iommu_domain *domain);
void (*domain_destroy)(struct iommu_domain *domain);
/* Domain allocation and freeing by the iommu driver */ /* Domain allocation and freeing by the iommu driver */
struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type); struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type);