From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org,
Viresh Kumar <viresh.kumar@linaro.org>,
spear-devel <spear-devel@list.st.com>
Subject: [PATCHv2 10/11] dw_dmac: backlink to dw_dma in dw_dma_chan is superfluous
Date: Thu, 10 Jan 2013 10:53:05 +0200 [thread overview]
Message-ID: <1357807986-4026-11-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1357807986-4026-1-git-send-email-andriy.shevchenko@linux.intel.com>
The same information could be extracted from the struct dma_chan.
The patch introduces helper function dwc_get_data_width() as well.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/dma/dw_dmac.c | 27 ++++++++++++++++++++-------
drivers/dma/dw_dmac_regs.h | 3 ---
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index c87d8ab..f9d37ec 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -73,6 +73,22 @@ static inline unsigned int dwc_get_sms(struct dw_dma_slave *slave)
*/
#define NR_DESCS_PER_CHANNEL 64
+#define SRC_MASTER 0
+#define DST_MASTER 1
+
+static inline unsigned int dwc_get_data_width(struct dma_chan *chan, int master)
+{
+ struct dw_dma *dw = to_dw_dma(chan->device);
+ struct dw_dma_slave *dws = chan->private;
+
+ if (master == SRC_MASTER)
+ return dw->data_width[dwc_get_sms(dws)];
+ else if (master == DST_MASTER)
+ return dw->data_width[dwc_get_dms(dws)];
+
+ return 0;
+}
+
/*----------------------------------------------------------------------*/
/*
@@ -701,7 +717,6 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
size_t len, unsigned long flags)
{
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
- struct dw_dma_slave *dws = chan->private;
struct dw_desc *desc;
struct dw_desc *first;
struct dw_desc *prev;
@@ -724,8 +739,8 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
dwc->direction = DMA_MEM_TO_MEM;
- data_width = min_t(unsigned int, dwc->dw->data_width[dwc_get_sms(dws)],
- dwc->dw->data_width[dwc_get_dms(dws)]);
+ data_width = min_t(unsigned int, dwc_get_data_width(chan, SRC_MASTER),
+ dwc_get_data_width(chan, DST_MASTER));
src_width = dst_width = min_t(unsigned int, data_width,
dwc_fast_fls(src | dest | len));
@@ -790,7 +805,6 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
unsigned long flags, void *context)
{
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
- struct dw_dma_slave *dws = chan->private;
struct dma_slave_config *sconfig = &dwc->dma_sconfig;
struct dw_desc *prev;
struct dw_desc *first;
@@ -824,7 +838,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
ctllo |= sconfig->device_fc ? DWC_CTLL_FC(DW_DMA_FC_P_M2P) :
DWC_CTLL_FC(DW_DMA_FC_D_M2P);
- data_width = dwc->dw->data_width[dwc_get_sms(dws)];
+ data_width = dwc_get_data_width(chan, SRC_MASTER);
for_each_sg(sgl, sg, sg_len, i) {
struct dw_desc *desc;
@@ -887,7 +901,7 @@ slave_sg_todev_fill_desc:
ctllo |= sconfig->device_fc ? DWC_CTLL_FC(DW_DMA_FC_P_P2M) :
DWC_CTLL_FC(DW_DMA_FC_D_P2M);
- data_width = dwc->dw->data_width[dwc_get_dms(dws)];
+ data_width = dwc_get_data_width(chan, DST_MASTER);
for_each_sg(sgl, sg, sg_len, i) {
struct dw_desc *desc;
@@ -1739,7 +1753,6 @@ static int dw_probe(struct platform_device *pdev)
channel_clear_bit(dw, CH_EN, dwc->mask);
- dwc->dw = dw;
dwc->direction = DMA_TRANS_NONE;
/* hardware configuration */
diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index f9532c2..577f2dd 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -214,9 +214,6 @@ struct dw_dma_chan {
/* configuration passed via DMA_SLAVE_CONFIG */
struct dma_slave_config dma_sconfig;
-
- /* backlink to dw_dma */
- struct dw_dma *dw;
};
static inline struct dw_dma_chan_regs __iomem *
--
1.7.10.4
next prev parent reply other threads:[~2013-01-10 8:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 8:52 [PATCHv2 00/11] patches against slave dma subsystem Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 01/11] dmaengine: introduce is_slave_direction function Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 02/11] dma: at_hdmac: check direction properly for cyclic transfers Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 03/11] dma: dw_dmac: check direction properly in dw_dma_cyclic_prep Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 04/11] dma: ep93xx_dma: reuse is_slave_direction helper Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 05/11] dma: ipu_idmac: " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 06/11] dma: ste_dma40: " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 07/11] dw_dmac: call .probe after we have a device in place Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 08/11] dw_dmac: store direction in the custom channel structure Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 09/11] dw_dmac: make usage of dw_dma_slave optional Andy Shevchenko
2013-01-10 9:08 ` Andy Shevchenko
2013-01-10 9:11 ` [PATCHv2.1] " Andy Shevchenko
2013-01-10 8:53 ` Andy Shevchenko [this message]
2013-01-10 8:53 ` [PATCHv2 11/11] dma: dw_dmac: clear suspend bit during termination Andy Shevchenko
2013-01-12 13:09 ` [PATCHv2 00/11] patches against slave dma subsystem 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=1357807986-4026-11-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spear-devel@list.st.com \
--cc=vinod.koul@intel.com \
--cc=viresh.kumar@linaro.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).