According to the DMA documentation allocating a channel and configuring it are two separate actions. By removing the configuration code from the channel allocation path we lighten the burden on the information required to successfully allocate a channel.
Cc: Vinod Koul <[email protected]> Cc: Dan Williams <[email protected]> Cc: Per Forlin <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Lee Jones <[email protected]> --- drivers/dma/ste_dma40.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 2a0a9d4..9e423ad 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2463,16 +2463,10 @@ static int d40_alloc_chan_resources(struct dma_chan *chan) } pm_runtime_get_sync(d40c->base->dev); - /* Fill in basic CFG register values */ - d40_phy_cfg(&d40c->dma_cfg, &d40c->src_def_cfg, - &d40c->dst_def_cfg, chan_is_logical(d40c)); d40_set_prio_realtime(d40c); if (chan_is_logical(d40c)) { - d40_log_cfg(&d40c->dma_cfg, - &d40c->log_def.lcsp1, &d40c->log_def.lcsp3); - if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM) d40c->lcpa = d40c->base->lcpa_base + d40c->dma_cfg.src_dev_type * D40_LCPA_CHAN_SIZE; @@ -2487,14 +2481,6 @@ static int d40_alloc_chan_resources(struct dma_chan *chan) d40c->phy_chan->num, d40c->dma_cfg.use_fixed_channel ? ", fixed" : ""); - - /* - * Only write channel configuration to the DMA if the physical - * resource is free. In case of multiple logical channels - * on the same physical resource, only the first write is necessary. - */ - if (is_free_phy) - d40_config_write(d40c); fail: pm_runtime_mark_last_busy(d40c->base->dev); pm_runtime_put_autosuspend(d40c->base->dev); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
