From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/12] dma: mxs-dma: remove code left from generic DMA binding conversion
Date: Wed, 27 Feb 2013 23:25:47 +0800 [thread overview]
Message-ID: <1361978748-25281-12-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1361978748-25281-1-git-send-email-shawn.guo@linaro.org>
With all mxs-dma clients moved to use generic DMA helper, the code
left from generic DMA binding conversion can be removed now.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/dma/mxs-dma.c | 23 -----------------------
include/linux/fsl/mxs-dma.h | 20 --------------------
2 files changed, 43 deletions(-)
delete mode 100644 include/linux/fsl/mxs-dma.h
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 4edf8e9..62b4ba1 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -23,7 +23,6 @@
#include <linux/dmaengine.h>
#include <linux/delay.h>
#include <linux/module.h>
-#include <linux/fsl/mxs-dma.h>
#include <linux/stmp_device.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -198,24 +197,6 @@ static struct mxs_dma_chan *to_mxs_dma_chan(struct dma_chan *chan)
return container_of(chan, struct mxs_dma_chan, chan);
}
-int mxs_dma_is_apbh(struct dma_chan *chan)
-{
- struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
- struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
-
- return dma_is_apbh(mxs_dma);
-}
-EXPORT_SYMBOL_GPL(mxs_dma_is_apbh);
-
-int mxs_dma_is_apbx(struct dma_chan *chan)
-{
- struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
- struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
-
- return !dma_is_apbh(mxs_dma);
-}
-EXPORT_SYMBOL_GPL(mxs_dma_is_apbx);
-
static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
{
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -350,13 +331,9 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id)
static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
{
struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
- struct mxs_dma_data *data = chan->private;
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
int ret;
- if (data)
- mxs_chan->chan_irq = data->chan_irq;
-
mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev,
CCW_BLOCK_SIZE, &mxs_chan->ccw_phys,
GFP_KERNEL);
diff --git a/include/linux/fsl/mxs-dma.h b/include/linux/fsl/mxs-dma.h
deleted file mode 100644
index 55d8702..0000000
--- a/include/linux/fsl/mxs-dma.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __MACH_MXS_DMA_H__
-#define __MACH_MXS_DMA_H__
-
-#include <linux/dmaengine.h>
-
-struct mxs_dma_data {
- int chan_irq;
-};
-
-extern int mxs_dma_is_apbh(struct dma_chan *chan);
-extern int mxs_dma_is_apbx(struct dma_chan *chan);
-#endif /* __MACH_MXS_DMA_H__ */
--
1.7.9.5
next prev parent reply other threads:[~2013-02-27 15:25 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-27 15:25 [PATCH 00/12] ARM: mxs: move to generic DMA device tree binding Shawn Guo
2013-02-27 15:25 ` [PATCH 01/12] ARM: dts: add generic DMA device tree binding for mxs-dma Shawn Guo
2013-02-27 20:36 ` Arnd Bergmann
2013-02-28 6:39 ` Shawn Guo
2013-02-28 10:48 ` Arnd Bergmann
2013-02-27 15:25 ` [PATCH 02/12] dma: mxs-dma: use devm_* managed functions Shawn Guo
2013-02-27 15:25 ` [PATCH 03/12] dma: mxs-dma: move to generic device tree binding Shawn Guo
2013-02-27 20:50 ` Arnd Bergmann
2013-02-28 7:24 ` Shawn Guo
2013-02-27 15:25 ` [PATCH 04/12] mmc: mxs-mmc: move to use generic DMA helper Shawn Guo
2013-02-27 20:54 ` Arnd Bergmann
2013-02-28 8:28 ` Shawn Guo
2013-02-28 10:50 ` Arnd Bergmann
2013-02-27 15:25 ` [PATCH 05/12] spi: mxs-spi: " Shawn Guo
2013-03-02 23:17 ` Grant Likely
2013-02-27 15:25 ` [PATCH 06/12] i2c: i2c-mxs: " Shawn Guo
2013-02-27 15:25 ` [PATCH 07/12] mtd: gpmi: " Shawn Guo
2013-02-28 8:39 ` Huang Shijie
2013-03-01 1:14 ` Shawn Guo
2013-03-08 13:19 ` Artem Bityutskiy
2013-03-08 14:06 ` Arnd Bergmann
2013-03-11 7:32 ` Artem Bityutskiy
2013-03-08 16:26 ` Huang Shijie
2013-03-11 3:03 ` Shawn Guo
2013-02-27 15:25 ` [PATCH 08/12] serial: mxs-auart: " Shawn Guo
2013-02-27 15:25 ` [PATCH 09/12] ASoC: dmaengine_pcm: support use of " Shawn Guo
2013-02-27 21:02 ` Arnd Bergmann
2013-02-28 8:09 ` Shawn Guo
2013-03-01 10:23 ` Mark Brown
2013-03-04 8:37 ` Shawn Guo
2013-02-27 15:25 ` [PATCH 10/12] ASoC: mxs: move to use " Shawn Guo
2013-02-27 15:25 ` Shawn Guo [this message]
2013-02-27 15:25 ` [PATCH 12/12] ARM: dts: remove mxs-dma channel interrupt number from client nodes Shawn Guo
2013-02-27 21:05 ` [PATCH 00/12] ARM: mxs: move to generic DMA device tree binding Arnd Bergmann
2013-02-28 19:20 ` Marek Vasut
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=1361978748-25281-12-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).