Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

authored by

Maxime Ripard and committed by
Vinod Koul
be16d833 2c55536a

+2 -7
+2 -7
drivers/dma/txx9dmac.c
··· 901 901 return &first->txd; 902 902 } 903 903 904 - static int txx9dmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 905 - unsigned long arg) 904 + static int txx9dmac_terminate_all(struct dma_chan *chan) 906 905 { 907 906 struct txx9dmac_chan *dc = to_txx9dmac_chan(chan); 908 907 struct txx9dmac_desc *desc, *_desc; 909 908 LIST_HEAD(list); 910 - 911 - /* Only supports DMA_TERMINATE_ALL */ 912 - if (cmd != DMA_TERMINATE_ALL) 913 - return -EINVAL; 914 909 915 910 dev_vdbg(chan2dev(chan), "terminate_all\n"); 916 911 spin_lock_bh(&dc->lock); ··· 1104 1109 dc->dma.dev = &pdev->dev; 1105 1110 dc->dma.device_alloc_chan_resources = txx9dmac_alloc_chan_resources; 1106 1111 dc->dma.device_free_chan_resources = txx9dmac_free_chan_resources; 1107 - dc->dma.device_control = txx9dmac_control; 1112 + dc->dma.device_terminate_all = txx9dmac_terminate_all; 1108 1113 dc->dma.device_tx_status = txx9dmac_tx_status; 1109 1114 dc->dma.device_issue_pending = txx9dmac_issue_pending; 1110 1115 if (pdata && pdata->memcpy_chan == ch) {