Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f26e03ad authored by Fabio Baltieri's avatar Fabio Baltieri
Browse files

dmaengine: ste_dma40: minor cosmetic fixes 



This patch contains various non functional cosmetic fixes.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
parent 762eb33f

drivers/dma/ste_dma40.c

+12 −21
Original line number Diff line number Diff line
@@ -1609,15 +1609,13 @@ static void dma_tasklet(unsigned long data) 
		if (async_tx_test_ack(&d40d->txd)) {

			d40_desc_remove(d40d);

			d40_desc_free(d40c, d40d);

		} else {

			if (!d40d->is_in_client_list) {

		} else if (!d40d->is_in_client_list) {

			d40_desc_remove(d40d);

			d40_lcla_free_all(d40c, d40d);

			list_add_tail(&d40d->node, &d40c->client);

			d40d->is_in_client_list = true;

		}

	}

	}



	d40c->pending_tx--;
@@ -2123,7 +2121,6 @@ static bool d40_is_paused(struct d40_chan *d40c) 


}





static u32 stedma40_residue(struct dma_chan *chan)

{

	struct d40_chan *d40c =
@@ -2199,7 +2196,6 @@ d40_prep_sg_phy(struct d40_chan *chan, struct d40_desc *desc, 
	return ret < 0 ? ret : 0;

}





static struct d40_desc *

d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg,

	      unsigned int sg_len, unsigned long dma_flags)
@@ -2225,7 +2221,6 @@ d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg, 
		goto err;

	}





	desc->lli_current = 0;

	desc->txd.flags = dma_flags;

	desc->txd.tx_submit = d40_tx_submit;
@@ -2274,7 +2269,6 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 
		return NULL;

	}





	spin_lock_irqsave(&chan->lock, flags);



	desc = d40_prep_desc(chan, sg_src, sg_len, dma_flags);
@@ -2471,7 +2465,6 @@ static void d40_free_chan_resources(struct dma_chan *chan) 
		return;

	}





	spin_lock_irqsave(&d40c->lock, flags);



	err = d40_free_dma(d40c);
@@ -2514,12 +2507,10 @@ d40_prep_memcpy_sg(struct dma_chan *chan, 
	return d40_prep_sg(chan, src_sg, dst_sg, src_nents, DMA_NONE, dma_flags);

}



static struct dma_async_tx_descriptor *d40_prep_slave_sg(struct dma_chan *chan,

							 struct scatterlist *sgl,

							 unsigned int sg_len,

							 enum dma_transfer_direction direction,

							 unsigned long dma_flags,

							 void *context)

static struct dma_async_tx_descriptor *

d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

		  unsigned int sg_len, enum dma_transfer_direction direction,

		  unsigned long dma_flags, void *context)

{

	if (direction != DMA_DEV_TO_MEM && direction != DMA_MEM_TO_DEV)

		return NULL;

drivers/dma/ste_dma40_ll.c

+1 −1

File changed.

Contains only whitespace changes.