diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-17 08:42:42 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 02:03:22 -0500 |
commit | be16d8330aa199e888334a99774f68e4a350e841 (patch) | |
tree | acb885f6960cdf4374b2073338f129df28b62e59 | |
parent | 2c55536ac3bf07416f8b7315d334a346a7ba3e30 (diff) |
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>
-rw-r--r-- | drivers/dma/txx9dmac.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c index 0659ec9c4488..8849318b32b7 100644 --- a/drivers/dma/txx9dmac.c +++ b/drivers/dma/txx9dmac.c | |||
@@ -901,17 +901,12 @@ txx9dmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |||
901 | return &first->txd; | 901 | return &first->txd; |
902 | } | 902 | } |
903 | 903 | ||
904 | static int txx9dmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | 904 | static int txx9dmac_terminate_all(struct dma_chan *chan) |
905 | unsigned long arg) | ||
906 | { | 905 | { |
907 | struct txx9dmac_chan *dc = to_txx9dmac_chan(chan); | 906 | struct txx9dmac_chan *dc = to_txx9dmac_chan(chan); |
908 | struct txx9dmac_desc *desc, *_desc; | 907 | struct txx9dmac_desc *desc, *_desc; |
909 | LIST_HEAD(list); | 908 | LIST_HEAD(list); |
910 | 909 | ||
911 | /* Only supports DMA_TERMINATE_ALL */ | ||
912 | if (cmd != DMA_TERMINATE_ALL) | ||
913 | return -EINVAL; | ||
914 | |||
915 | dev_vdbg(chan2dev(chan), "terminate_all\n"); | 910 | dev_vdbg(chan2dev(chan), "terminate_all\n"); |
916 | spin_lock_bh(&dc->lock); | 911 | spin_lock_bh(&dc->lock); |
917 | 912 | ||
@@ -1109,7 +1104,7 @@ static int __init txx9dmac_chan_probe(struct platform_device *pdev) | |||
1109 | dc->dma.dev = &pdev->dev; | 1104 | dc->dma.dev = &pdev->dev; |
1110 | dc->dma.device_alloc_chan_resources = txx9dmac_alloc_chan_resources; | 1105 | dc->dma.device_alloc_chan_resources = txx9dmac_alloc_chan_resources; |
1111 | dc->dma.device_free_chan_resources = txx9dmac_free_chan_resources; | 1106 | dc->dma.device_free_chan_resources = txx9dmac_free_chan_resources; |
1112 | dc->dma.device_control = txx9dmac_control; | 1107 | dc->dma.device_terminate_all = txx9dmac_terminate_all; |
1113 | dc->dma.device_tx_status = txx9dmac_tx_status; | 1108 | dc->dma.device_tx_status = txx9dmac_tx_status; |
1114 | dc->dma.device_issue_pending = txx9dmac_issue_pending; | 1109 | dc->dma.device_issue_pending = txx9dmac_issue_pending; |
1115 | if (pdata && pdata->memcpy_chan == ch) { | 1110 | if (pdata && pdata->memcpy_chan == ch) { |