mtd: lpc32xx_slc: Adjust to pl08x DMA interface changes

This patch adjusts the LPC32xx SLC NAND driver to the new pl08x DMA interface,
fixing the compile error resulting from changed pl08x structures.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 1719387dd008a62b8dbc0c223e98d559d8b98ff1..c8c1d06b35ab79ba9556b0c5ad71367f01b35ac2 100644 (file)
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/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;