Commit f26e03ad2b50be50c98f8ecb1fd9dbdf94db91ab
1 parent
762eb33fde
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
dmaengine: ste_dma40: minor cosmetic fixes
This patch contains various non functional cosmetic fixes. Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Showing 2 changed files with 13 additions and 22 deletions Side-by-side Diff
drivers/dma/ste_dma40.c
| ... | ... | @@ -1609,13 +1609,11 @@ |
| 1609 | 1609 | if (async_tx_test_ack(&d40d->txd)) { |
| 1610 | 1610 | d40_desc_remove(d40d); |
| 1611 | 1611 | d40_desc_free(d40c, d40d); |
| 1612 | - } else { | |
| 1613 | - if (!d40d->is_in_client_list) { | |
| 1614 | - d40_desc_remove(d40d); | |
| 1615 | - d40_lcla_free_all(d40c, d40d); | |
| 1616 | - list_add_tail(&d40d->node, &d40c->client); | |
| 1617 | - d40d->is_in_client_list = true; | |
| 1618 | - } | |
| 1612 | + } else if (!d40d->is_in_client_list) { | |
| 1613 | + d40_desc_remove(d40d); | |
| 1614 | + d40_lcla_free_all(d40c, d40d); | |
| 1615 | + list_add_tail(&d40d->node, &d40c->client); | |
| 1616 | + d40d->is_in_client_list = true; | |
| 1619 | 1617 | } |
| 1620 | 1618 | } |
| 1621 | 1619 | |
| ... | ... | @@ -2123,7 +2121,6 @@ |
| 2123 | 2121 | |
| 2124 | 2122 | } |
| 2125 | 2123 | |
| 2126 | - | |
| 2127 | 2124 | static u32 stedma40_residue(struct dma_chan *chan) |
| 2128 | 2125 | { |
| 2129 | 2126 | struct d40_chan *d40c = |
| ... | ... | @@ -2199,7 +2196,6 @@ |
| 2199 | 2196 | return ret < 0 ? ret : 0; |
| 2200 | 2197 | } |
| 2201 | 2198 | |
| 2202 | - | |
| 2203 | 2199 | static struct d40_desc * |
| 2204 | 2200 | d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg, |
| 2205 | 2201 | unsigned int sg_len, unsigned long dma_flags) |
| ... | ... | @@ -2225,7 +2221,6 @@ |
| 2225 | 2221 | goto err; |
| 2226 | 2222 | } |
| 2227 | 2223 | |
| 2228 | - | |
| 2229 | 2224 | desc->lli_current = 0; |
| 2230 | 2225 | desc->txd.flags = dma_flags; |
| 2231 | 2226 | desc->txd.tx_submit = d40_tx_submit; |
| ... | ... | @@ -2274,7 +2269,6 @@ |
| 2274 | 2269 | return NULL; |
| 2275 | 2270 | } |
| 2276 | 2271 | |
| 2277 | - | |
| 2278 | 2272 | spin_lock_irqsave(&chan->lock, flags); |
| 2279 | 2273 | |
| 2280 | 2274 | desc = d40_prep_desc(chan, sg_src, sg_len, dma_flags); |
| 2281 | 2275 | |
| ... | ... | @@ -2432,11 +2426,11 @@ |
| 2432 | 2426 | |
| 2433 | 2427 | if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM) |
| 2434 | 2428 | d40c->lcpa = d40c->base->lcpa_base + |
| 2435 | - d40c->dma_cfg.src_dev_type * D40_LCPA_CHAN_SIZE; | |
| 2429 | + d40c->dma_cfg.src_dev_type * D40_LCPA_CHAN_SIZE; | |
| 2436 | 2430 | else |
| 2437 | 2431 | d40c->lcpa = d40c->base->lcpa_base + |
| 2438 | - d40c->dma_cfg.dst_dev_type * | |
| 2439 | - D40_LCPA_CHAN_SIZE + D40_LCPA_CHAN_DST_DELTA; | |
| 2432 | + d40c->dma_cfg.dst_dev_type * | |
| 2433 | + D40_LCPA_CHAN_SIZE + D40_LCPA_CHAN_DST_DELTA; | |
| 2440 | 2434 | } |
| 2441 | 2435 | |
| 2442 | 2436 | dev_dbg(chan2dev(d40c), "allocated %s channel (phy %d%s)\n", |
| ... | ... | @@ -2471,7 +2465,6 @@ |
| 2471 | 2465 | return; |
| 2472 | 2466 | } |
| 2473 | 2467 | |
| 2474 | - | |
| 2475 | 2468 | spin_lock_irqsave(&d40c->lock, flags); |
| 2476 | 2469 | |
| 2477 | 2470 | err = d40_free_dma(d40c); |
| ... | ... | @@ -2514,12 +2507,10 @@ |
| 2514 | 2507 | return d40_prep_sg(chan, src_sg, dst_sg, src_nents, DMA_NONE, dma_flags); |
| 2515 | 2508 | } |
| 2516 | 2509 | |
| 2517 | -static struct dma_async_tx_descriptor *d40_prep_slave_sg(struct dma_chan *chan, | |
| 2518 | - struct scatterlist *sgl, | |
| 2519 | - unsigned int sg_len, | |
| 2520 | - enum dma_transfer_direction direction, | |
| 2521 | - unsigned long dma_flags, | |
| 2522 | - void *context) | |
| 2510 | +static struct dma_async_tx_descriptor * | |
| 2511 | +d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |
| 2512 | + unsigned int sg_len, enum dma_transfer_direction direction, | |
| 2513 | + unsigned long dma_flags, void *context) | |
| 2523 | 2514 | { |
| 2524 | 2515 | if (direction != DMA_DEV_TO_MEM && direction != DMA_MEM_TO_DEV) |
| 2525 | 2516 | return NULL; |