[PATCH 10/10] iommu/core: Remove global iommu_ops and register_iommu

Joerg Roedel
2011-09-07T16:08:50Z

With all IOMMU drivers being converted to bus_set_iommu the
global iommu_ops are no longer required. The same is true
for the deprecated register_iommu function.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
drivers/iommu/iommu.c | 27 ++++-----------------------
include/linux/iommu.h | 1 -
2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index f2ced4c..82178cb 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -25,50 +25,31 @@
#include <linux/errno.h>
#include <linux/iommu.h>

-static struct iommu_ops *iommu_ops;
-
-void register_iommu(struct iommu_ops *ops)
-{
- if (iommu_ops)
- BUG();
-
- iommu_ops = ops;
-}
-
void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
{
}

bool iommu_present(struct bus_type *bus)
{
- if (bus->iommu_ops != NULL)
- return true;
- else
- return iommu_ops != NULL;
+ return bus->iommu_ops != NULL;
}
EXPORT_SYMBOL_GPL(iommu_present);

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{
struct iommu_domain *domain;
- struct iommu_ops *ops;
int ret;

- if (bus->iommu_ops)
- ops = bus->iommu_ops;
- else
- ops = iommu_ops;
-
- if (ops == NULL)
+ if (bus->iommu_ops == NULL)
return NULL;

domain = kmalloc(sizeof(*domain), GFP_KERNEL);
if (!domain)
return NULL;

- domain->ops = ops;
+ domain->ops = bus->iommu_ops;

- ret = iommu_ops->domain_init(domain);
+ ret = domain->ops->domain_init(domain);
if (ret)
goto out_free;

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index de73219..7014f40 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -54,7 +54,6 @@ struct iommu_ops {
unsigned long cap);
};

-extern void register_iommu(struct iommu_ops *ops);
extern void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops);
extern bool iommu_present(struct bus_type *bus);
extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);
--
1.7.4.1