diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-17 14:42:23 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-12-22 12:29:01 +0530 |
| commit | ac850cc7da0c94215b41ac8d6e780fd60c93f983 (patch) | |
| tree | fb10d41385ec08efb5d662689ec409246fe3b58f /drivers/dma/moxart-dma.c | |
| parent | f43a6fd400ba66b59bda41e72db2ae1bd5cd549b (diff) | |
| download | linux-ac850cc7da0c94215b41ac8d6e780fd60c93f983.tar.bz2 | |
dmaengine: moxart: Split device_control
Split the device_control callback of the Moxart DMA driver to make use of the
newly introduced callbacks, 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>
Diffstat (limited to 'drivers/dma/moxart-dma.c')
| -rw-r--r-- | drivers/dma/moxart-dma.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/dma/moxart-dma.c b/drivers/dma/moxart-dma.c index 53032bac06e0..15cab7d79525 100644 --- a/drivers/dma/moxart-dma.c +++ b/drivers/dma/moxart-dma.c @@ -263,28 +263,6 @@ static int moxart_slave_config(struct dma_chan *chan, return 0; } -static int moxart_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, - unsigned long arg) -{ - int ret = 0; - - switch (cmd) { - case DMA_PAUSE: - case DMA_RESUME: - return -EINVAL; - case DMA_TERMINATE_ALL: - moxart_terminate_all(chan); - break; - case DMA_SLAVE_CONFIG: - ret = moxart_slave_config(chan, (struct dma_slave_config *)arg); - break; - default: - ret = -ENOSYS; - } - - return ret; -} - static struct dma_async_tx_descriptor *moxart_prep_slave_sg( struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len, enum dma_transfer_direction dir, @@ -531,7 +509,8 @@ static void moxart_dma_init(struct dma_device *dma, struct device *dev) dma->device_free_chan_resources = moxart_free_chan_resources; dma->device_issue_pending = moxart_issue_pending; dma->device_tx_status = moxart_tx_status; - dma->device_control = moxart_control; + dma->device_config = moxart_slave_config; + dma->device_terminate_all = moxart_terminate_all; dma->dev = dev; INIT_LIST_HEAD(&dma->channels); |