diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-10-25 10:51:26 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 10:51:26 +0800 |
| commit | 2a3be2cbdf661c521c00044e56767e97083c10a9 (patch) | |
| tree | da94d58d05569ff88b668642b7e3455c24189276 | |
| parent | a5e8e8da75462aa7ef9b64714152f632770ad04f (diff) | |
fix: remove isr callback
Signed-off-by: Sebastien Jan <s-jan@ti.com>
| -rw-r--r-- | arch/arm/plat-omap/include/plat/iommu.h | 5 | ||||
| -rw-r--r-- | arch/arm/plat-omap/iommu.c | 31 |
2 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h index c81882ca4c1..a03823a81ac 100644 --- a/arch/arm/plat-omap/include/plat/iommu.h +++ b/arch/arm/plat-omap/include/plat/iommu.h @@ -32,7 +32,6 @@ struct iommu { struct module *owner; void __iomem *regbase; struct device *dev; - void *isr_priv; unsigned int refcount; struct mutex iommu_lock; /* global for this whole object */ @@ -190,10 +189,6 @@ extern void iopgtable_clear_entry_all(struct iommu *obj); extern int iommu_set_da_range(struct iommu *obj, u32 start, u32 end); extern struct iommu *iommu_get(const char *name); extern void iommu_put(struct iommu *obj); -extern int iommu_set_isr(const char *name, - int (*isr)(struct iommu *obj, u32 da, u32 iommu_errs, - void *priv), - void *isr_priv); u32 iommu_save_ctx(struct iommu *obj); u32 iommu_restore_ctx(struct iommu *obj); diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c index 4f9e9b85647..06635f40e4d 100644 --- a/arch/arm/plat-omap/iommu.c +++ b/arch/arm/plat-omap/iommu.c @@ -877,10 +877,6 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) if (errs == 0) return IRQ_HANDLED; - /* Fault callback or TLB/PTE Dynamic loading */ - if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv)) - return IRQ_HANDLED; - iommu_disable(obj); iopgd = iopgd_offset(obj, da); @@ -999,33 +995,6 @@ void iommu_put(struct iommu *obj) } EXPORT_SYMBOL_GPL(iommu_put); -int iommu_set_isr(const char *name, - int (*isr)(struct iommu *obj, u32 da, u32 iommu_errs, - void *priv), - void *isr_priv) -{ - struct device *dev; - struct iommu *obj; - - dev = driver_find_device(&omap_iommu_driver.driver, NULL, (void *)name, - device_match_by_alias); - if (!dev) - return -ENODEV; - - obj = to_iommu(dev); - mutex_lock(&obj->iommu_lock); - if (obj->refcount != 0) { - mutex_unlock(&obj->iommu_lock); - return -EBUSY; - } - obj->isr = isr; - obj->isr_priv = isr_priv; - mutex_unlock(&obj->iommu_lock); - - return 0; -} -EXPORT_SYMBOL_GPL(iommu_set_isr); - /* * OMAP Device MMU(IOMMU) detection */ |