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

Commit be16d833 authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul
Browse files

dmaengine: txx9: Rename device_control 



Rename the device_control callback of the TXX9 DMA driver to terminate_all
since it's all it's really doing. That will eventually be used to retrieve
slave capabilities.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 2c55536a

drivers/dma/txx9dmac.c

+2 −7
Original line number Diff line number Diff line
@@ -901,17 +901,12 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
	return &first->txd;

}



static int txx9dmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,

			    unsigned long arg)

static int txx9dmac_terminate_all(struct dma_chan *chan)

{

	struct txx9dmac_chan *dc = to_txx9dmac_chan(chan);

	struct txx9dmac_desc *desc, *_desc;

	LIST_HEAD(list);



	/* Only supports DMA_TERMINATE_ALL */

	if (cmd != DMA_TERMINATE_ALL)

		return -EINVAL;



	dev_vdbg(chan2dev(chan), "terminate_all\n");

	spin_lock_bh(&dc->lock);
@@ -1109,7 +1104,7 @@ static int __init txx9dmac_chan_probe(struct platform_device *pdev) 
	dc->dma.dev = &pdev->dev;

	dc->dma.device_alloc_chan_resources = txx9dmac_alloc_chan_resources;

	dc->dma.device_free_chan_resources = txx9dmac_free_chan_resources;

	dc->dma.device_control = txx9dmac_control;

	dc->dma.device_terminate_all = txx9dmac_terminate_all;

	dc->dma.device_tx_status = txx9dmac_tx_status;

	dc->dma.device_issue_pending = txx9dmac_issue_pending;

	if (pdata && pdata->memcpy_chan == ch) {