From: Vinod Koul <vinod.koul@intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.jf.intel.com>
Cc: linux-kernel@vger.kernel.org,
Viresh Kumar <viresh.kumar@linaro.org>,
spear-devel <spear-devel@list.st.com>
Subject: Re: [resend][PATCH 11/16] dw_dmac: backlink to dw_dma in dw_dma_chan is superfluous
Date: Wed, 9 Jan 2013 06:24:43 -0800 [thread overview]
Message-ID: <20130109142443.GQ19691@intel.com> (raw)
In-Reply-To: <1357719435-29955-12-git-send-email-andriy.shevchenko@linux.intel.com>
On Wed, Jan 09, 2013 at 10:17:10AM +0200, Andy Shevchenko wrote:
> The same information could be exctracted from the struct dma_chan.
typo... ^^^^^^^^^^
> 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 ff9d68b..39a6506 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;
> +}
> +
> /*----------------------------------------------------------------------*/
>
> /*
> @@ -703,7 +719,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;
> @@ -726,8 +741,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));
> @@ -792,7 +807,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;
> @@ -826,7 +840,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;
> @@ -889,7 +903,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;
> @@ -1720,7 +1734,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-09 14:49 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 12:54 dw_dmac patches Andy Shevchenko
2013-01-08 15:54 ` Vinod Koul
2013-01-09 8:16 ` [resend][PATCH 00/16] dw_dmac related patchset Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 01/16] dw_dmac: call .probe after we have a device in place Andy Shevchenko
2013-01-09 13:47 ` Vinod Koul
2013-01-09 14:56 ` Andy Shevchenko
2013-01-09 15:38 ` Vinod Koul
2013-01-09 18:04 ` Mika Westerberg
2013-01-12 12:28 ` Vinod Koul
2013-01-10 8:34 ` Viresh Kumar
2013-01-12 12:30 ` Vinod Koul
2013-01-09 8:17 ` [resend][PATCH 02/16] dw_dmac: absence of pdata isn't critical when autocfg is set Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 03/16] dmaengine: introduce is_slave_xfer function Andy Shevchenko
2013-01-09 13:50 ` Vinod Koul
2013-01-09 14:19 ` Viresh Kumar
2013-01-09 14:58 ` Andy Shevchenko
2013-01-09 15:10 ` Vinod Koul
2013-01-09 15:51 ` Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 04/16] dma: at_hdmac: check direction properly for cyclic transfers Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 05/16] dma: dw_dmac: check direction properly in dw_dma_cyclic_prep Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 06/16] dma: ep93xx_dma: reuse is_slave_xfer helper Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 07/16] dma: ipu_idmac: " Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 08/16] dma: ste_dma40: " Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 09/16] dw_dmac: store direction in the custom channel structure Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 10/16] dw_dmac: make usage of dw_dma_slave optional Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 11/16] dw_dmac: backlink to dw_dma in dw_dma_chan is superfluous Andy Shevchenko
2013-01-09 14:24 ` Vinod Koul [this message]
2013-01-09 15:02 ` Andy Shevchenko
2013-01-09 15:11 ` Vinod Koul
2013-01-09 8:17 ` [resend][PATCH 12/16] dw_dmac: check for mapping errors Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 13/16] dw_dmac: remove redundant check Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 14/16] dw_dmac: update tx_node_active in dwc_do_single_block Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 15/16] dma: dw_dmac: add dwc_chan_pause and dwc_chan_resume Andy Shevchenko
2013-01-09 8:17 ` [resend][PATCH 16/16] dma: dw_dmac: clear suspend bit during termination Andy Shevchenko
2013-01-09 14:18 ` Vinod Koul
2013-01-09 15:07 ` Andy Shevchenko
2013-01-09 15:44 ` [resend][PATCH 00/16] dw_dmac related patchset Vinod Koul
2013-01-10 8:28 ` Andy Shevchenko
2013-01-09 11:26 ` dw_dmac patches Andy Shevchenko
2013-01-11 12:01 ` Andy Shevchenko
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=20130109142443.GQ19691@intel.com \
--to=vinod.koul@intel.com \
--cc=andriy.shevchenko@linux.jf.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spear-devel@list.st.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 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.