ARM: omap: remove references to disable_irq_lch

The disable_irq_lch method is never actually used, so there's not much
point it existing; remove it.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 5bb8ce86d54bb4288e2be7a1319621defa1f0017..d292055d3117c0901b9f027eb104f780d351096f 100644 (file)
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -363,7 +363,6 @@ static int __init omap1_system_dma_init(void)
        p->clear_dma            = omap1_clear_dma;
        p->dma_write            = dma_write;
        p->dma_read             = dma_read;
-       p->disable_irq_lch      = NULL;
 
        p->errata = configure_dma_errata();
 

diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
index 49fd0d501c9bc5edcbb83bbb234891e0c381753c..81c2d3383bc50f6a6fd2b7e2c95580ad4625bf33 100644 (file)
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -112,15 +112,6 @@ static inline u32 dma_read(int reg, int lch)
        return val;
 }
 
-static inline void omap2_disable_irq_lch(int lch)
-{
-       u32 val;
-
-       val = dma_read(IRQENABLE_L0, lch);
-       val &= ~(1 << lch);
-       dma_write(val, IRQENABLE_L0, lch);
-}
-
 static void omap2_clear_dma(int lch)
 {
        int i = dma_common_ch_start;
@@ -239,7 +230,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
        }
 
        p->dma_attr             = (struct omap_dma_dev_attr *)oh->dev_attr;
-       p->disable_irq_lch      = omap2_disable_irq_lch;
        p->show_dma_caps        = omap2_show_dma_caps;
        p->clear_dma            = omap2_clear_dma;
        p->dma_write            = dma_write;

diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h
index d631658e223739d6bd1b6ebdd8f89b2f17bf5d63..0bb7de77d478b32107ef1c3a78e641041eb2fab4 100644 (file)
--- a/include/linux/omap-dma.h
+++ b/include/linux/omap-dma.h
@@ -275,7 +275,6 @@ struct omap_dma_dev_attr {
 struct omap_system_dma_plat_info {
        struct omap_dma_dev_attr *dma_attr;
        u32 errata;
-       void (*disable_irq_lch)(int lch);
        void (*show_dma_caps)(void);
        void (*clear_lch_regs)(int lch);
        void (*clear_dma)(int lch);