From 6a3d400292b29fe54d5a0a9d8cd098bd21aa028e Mon Sep 17 00:00:00 2001
From: Roland Stigge <stigge@antcom.de>
Date: Thu, 12 Jul 2012 14:22:56 +0200
Subject: [PATCH] --- yaml --- r: 332663 b: refs/heads/master c:
 314a15664e028e6bcafc03495cc492645d9df4df h: refs/heads/master i:   332661:
 a4e0f0423722559400f27d1989c276e4c86aedef   332659:
 945d6e2648604a75ba8d825397bcddd3356077d0   332655:
 c3af622ad90a1883db367147321269ca05be4132 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/mtd/nand/lpc32xx_slc.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 3fdfc8268361..7c9dcebfb10f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c99b8bfb22342ab0c06e07ee54fa0d5e638e52a
+refs/heads/master: 314a15664e028e6bcafc03495cc492645d9df4df
diff --git a/trunk/drivers/mtd/nand/lpc32xx_slc.c b/trunk/drivers/mtd/nand/lpc32xx_slc.c
index 1719387dd008..c8c1d06b35ab 100644
--- a/trunk/drivers/mtd/nand/lpc32xx_slc.c
+++ b/trunk/drivers/mtd/nand/lpc32xx_slc.c
@@ -714,17 +714,6 @@ static int lpc32xx_nand_write_page_raw_syndrome(struct mtd_info *mtd,
 	return 0;
 }
 
-static bool lpc32xx_dma_filter(struct dma_chan *chan, void *param)
-{
-	struct pl08x_dma_chan *ch =
-		container_of(chan, struct pl08x_dma_chan, chan);
-
-	/* In LPC32xx's PL080 DMA wiring, the SLC NAND DMA signal is #1 */
-	if (ch->cd->min_signal == 1)
-		return true;
-	return false;
-}
-
 static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host)
 {
 	struct mtd_info *mtd = &host->mtd;
@@ -732,7 +721,7 @@ static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host)
 
 	dma_cap_zero(mask);
 	dma_cap_set(DMA_SLAVE, mask);
-	host->dma_chan = dma_request_channel(mask, lpc32xx_dma_filter, NULL);
+	host->dma_chan = dma_request_channel(mask, pl08x_filter_id, "nand-slc");
 	if (!host->dma_chan) {
 		dev_err(mtd->dev.parent, "Failed to request DMA channel\n");
 		return -EBUSY;