All of lore.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk+kernel@arm.linux.org.uk>
To: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-omap@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>
Subject: [PATCH 18/26] ARM: omap: remove references to disable_irq_lch
Date: Mon, 10 Feb 2014 15:57:25 +0000	[thread overview]
Message-ID: <E1WCtEb-0006XF-Be@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20140210155531.GB26684@n2100.arm.linux.org.uk>

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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-omap1/dma.c |  1 -
 arch/arm/mach-omap2/dma.c | 10 ----------
 include/linux/omap-dma.h  |  1 -
 3 files changed, 12 deletions(-)

diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 5bb8ce86d54b..d292055d3117 100644
--- 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 49fd0d501c9b..81c2d3383bc5 100644
--- 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 d631658e2237..0bb7de77d478 100644
--- 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);
-- 
1.8.3.1


WARNING: multiple messages have this Message-ID (diff)
From: rmk+kernel@arm.linux.org.uk (Russell King)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 18/26] ARM: omap: remove references to disable_irq_lch
Date: Mon, 10 Feb 2014 15:57:25 +0000	[thread overview]
Message-ID: <E1WCtEb-0006XF-Be@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20140210155531.GB26684@n2100.arm.linux.org.uk>

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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-omap1/dma.c |  1 -
 arch/arm/mach-omap2/dma.c | 10 ----------
 include/linux/omap-dma.h  |  1 -
 3 files changed, 12 deletions(-)

diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 5bb8ce86d54b..d292055d3117 100644
--- 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 49fd0d501c9b..81c2d3383bc5 100644
--- 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 d631658e2237..0bb7de77d478 100644
--- 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);
-- 
1.8.3.1

  parent reply	other threads:[~2014-02-10 15:57 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-10 15:55 [PATCH 00/26] OMAP dma engine rework Russell King - ARM Linux
2014-02-10 15:55 ` Russell King - ARM Linux
2014-02-10 15:55 ` [PATCH 01/26] dmaengine: omap-dma: use devm_kzalloc() to allocate omap_dmadev Russell King
2014-02-10 15:55   ` Russell King
2014-02-10 15:56 ` [PATCH 02/26] dmaengine: omap-dma: provide a hook to get the underlying DMA platform ops Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 03/26] dmaengine: omap-dma: program hardware directly Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 04/26] dmaengine: omap-dma: consolidate writes to DMA registers Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 05/26] dmaengine: omap-dma: control start/stop directly Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 06/26] dmaengine: omap-dma: move reading of dma position to omap-dma.c Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 07/26] dmaengine: omap-dma: consolidate setup of CSDP Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 08/26] dmaengine: omap-dma: consolidate setup of CCR Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 09/26] dmaengine: omap-dma: provide register definitions Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 10/26] dmaengine: omap-dma: move CCR buffering disable errata out of the fast path Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 11/26] dmaengine: omap-dma: consolidate clearing channel status register Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 12/26] dmaengine: omap-dma: improve efficiency loading C.SA/C.EI/C.FI registers Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:56 ` [PATCH 13/26] dmaengine: omap-dma: move clnk_ctrl setting to preparation functions Russell King
2014-02-10 15:56   ` Russell King
2014-02-10 15:57 ` [PATCH 14/26] dmaengine: omap-dma: move barrier to omap_dma_start_desc() Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 15/26] dmaengine: omap-dma: use cached CCR value when enabling DMA Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 16/26] dmaengine: omap-dma: provide register read/write functions Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 17/26] dmaengine: omap-dma: cleanup errata 3.3 handling Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` Russell King [this message]
2014-02-10 15:57   ` [PATCH 18/26] ARM: omap: remove references to disable_irq_lch Russell King
2014-02-10 15:57 ` [PATCH 19/26] ARM: omap: remove almost-const variables Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 20/26] ARM: omap: clean up DMA register accesses Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 21/26] ARM: omap: dma: get rid of errata global Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 22/26] ARM: omap: move dma channel allocation into plat-omap code Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 23/26] ARM: omap: dma: get rid of 'p' allocation and clean up Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:57 ` [PATCH 24/26] dmaengine: omap-dma: move register read/writes into omap-dma.c Russell King
2014-02-10 15:57   ` Russell King
2014-02-10 15:58 ` [PATCH 25/26] dmaengine: omap-dma: move IRQ handling to omap-dma Russell King
2014-02-10 15:58   ` Russell King
2014-02-10 15:58 ` [PATCH 26/26] dmaengine: omap-dma: more consolidation of CCR register setup Russell King
2014-02-10 15:58   ` Russell King
2014-02-13 17:22 ` [PATCH 00/26] OMAP dma engine rework Tony Lindgren
2014-02-13 17:22   ` Tony Lindgren
2014-02-14 12:54 ` Sricharan R
2014-02-14 12:54   ` Sricharan R
2014-03-18 15:48 ` Vinod Koul
2014-03-18 15:48   ` Vinod Koul
2014-03-29 18:13   ` Russell King - ARM Linux
2014-03-29 18:13     ` Russell King - ARM Linux
2014-04-02 16:32     ` Vinod Koul
2014-04-02 16:32       ` Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1WCtEb-0006XF-Be@rmk-PC.arm.linux.org.uk \
    --to=rmk+kernel@arm.linux.org.uk \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.