diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-17 08:42:43 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 02:03:22 -0500 |
commit | 7664cfe00151dcd801cee0c52ebc8688e1899110 (patch) | |
tree | 90fd3e91735d9511317235538fe5cb7600c9ab20 | |
parent | be16d8330aa199e888334a99774f68e4a350e841 (diff) |
dmaengine: rapidio: tsi721: 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/rapidio/devices/tsi721_dma.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/rapidio/devices/tsi721_dma.c b/drivers/rapidio/devices/tsi721_dma.c index f64c5decb747..47295940a868 100644 --- a/drivers/rapidio/devices/tsi721_dma.c +++ b/drivers/rapidio/devices/tsi721_dma.c | |||
@@ -815,8 +815,7 @@ struct dma_async_tx_descriptor *tsi721_prep_rio_sg(struct dma_chan *dchan, | |||
815 | return txd; | 815 | return txd; |
816 | } | 816 | } |
817 | 817 | ||
818 | static int tsi721_device_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd, | 818 | static int tsi721_terminate_all(struct dma_chan *dchan) |
819 | unsigned long arg) | ||
820 | { | 819 | { |
821 | struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan); | 820 | struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan); |
822 | struct tsi721_tx_desc *desc, *_d; | 821 | struct tsi721_tx_desc *desc, *_d; |
@@ -825,9 +824,6 @@ static int tsi721_device_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd, | |||
825 | 824 | ||
826 | dev_dbg(dchan->device->dev, "%s: Entry\n", __func__); | 825 | dev_dbg(dchan->device->dev, "%s: Entry\n", __func__); |
827 | 826 | ||
828 | if (cmd != DMA_TERMINATE_ALL) | ||
829 | return -ENOSYS; | ||
830 | |||
831 | spin_lock_bh(&bdma_chan->lock); | 827 | spin_lock_bh(&bdma_chan->lock); |
832 | 828 | ||
833 | bdma_chan->active = false; | 829 | bdma_chan->active = false; |
@@ -901,7 +897,7 @@ int tsi721_register_dma(struct tsi721_device *priv) | |||
901 | mport->dma.device_tx_status = tsi721_tx_status; | 897 | mport->dma.device_tx_status = tsi721_tx_status; |
902 | mport->dma.device_issue_pending = tsi721_issue_pending; | 898 | mport->dma.device_issue_pending = tsi721_issue_pending; |
903 | mport->dma.device_prep_slave_sg = tsi721_prep_rio_sg; | 899 | mport->dma.device_prep_slave_sg = tsi721_prep_rio_sg; |
904 | mport->dma.device_control = tsi721_device_control; | 900 | mport->dma.device_terminate_all = tsi721_terminate_all; |
905 | 901 | ||
906 | err = dma_async_device_register(&mport->dma); | 902 | err = dma_async_device_register(&mport->dma); |
907 | if (err) | 903 | if (err) |