Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e38b1485 authored by Russell King's avatar Russell King
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b07fd625

arch/arm/mach-omap1/dma.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -363,7 +363,6 @@ static int __init omap1_system_dma_init(void) 
	p->clear_dma		= omap1_clear_dma;

	p->clear_dma		= omap1_clear_dma;

	p->dma_write		= dma_write;

	p->dma_write		= dma_write;

	p->dma_read		= dma_read;

	p->dma_read		= dma_read;

	p->disable_irq_lch	= NULL;





	p->errata = configure_dma_errata();

	p->errata = configure_dma_errata();

arch/arm/mach-omap2/dma.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -112,15 +112,6 @@ static inline u32 dma_read(int reg, int lch) 
	return val;

	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)

static void omap2_clear_dma(int lch)

{

{

	int i = dma_common_ch_start;

	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->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->show_dma_caps	= omap2_show_dma_caps;

	p->clear_dma		= omap2_clear_dma;

	p->clear_dma		= omap2_clear_dma;

	p->dma_write		= dma_write;

	p->dma_write		= dma_write;

include/linux/omap-dma.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -275,7 +275,6 @@ struct omap_dma_dev_attr { 
struct omap_system_dma_plat_info {

struct omap_system_dma_plat_info {

	struct omap_dma_dev_attr *dma_attr;

	struct omap_dma_dev_attr *dma_attr;

	u32 errata;

	u32 errata;

	void (*disable_irq_lch)(int lch);

	void (*show_dma_caps)(void);

	void (*show_dma_caps)(void);

	void (*clear_lch_regs)(int lch);

	void (*clear_lch_regs)(int lch);

	void (*clear_dma)(int lch);

	void (*clear_dma)(int lch);