diff options
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, | |||
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |
265 | 265 | ||
266 | static int moxart_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | ||
267 | unsigned long arg) | ||
268 | { | ||
269 | int ret = 0; | ||
270 | |||
271 | switch (cmd) { | ||
272 | case DMA_PAUSE: | ||
273 | case DMA_RESUME: | ||
274 | return -EINVAL; | ||
275 | case DMA_TERMINATE_ALL: | ||
276 | moxart_terminate_all(chan); | ||
277 | break; | ||
278 | case DMA_SLAVE_CONFIG: | ||
279 | ret = moxart_slave_config(chan, (struct dma_slave_config *)arg); | ||
280 | break; | ||
281 | default: | ||
282 | ret = -ENOSYS; | ||
283 | } | ||
284 | |||
285 | return ret; | ||
286 | } | ||
287 | |||
288 | static struct dma_async_tx_descriptor *moxart_prep_slave_sg( | 266 | static struct dma_async_tx_descriptor *moxart_prep_slave_sg( |
289 | struct dma_chan *chan, struct scatterlist *sgl, | 267 | struct dma_chan *chan, struct scatterlist *sgl, |
290 | unsigned int sg_len, enum dma_transfer_direction dir, | 268 | 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) | |||
531 | dma->device_free_chan_resources = moxart_free_chan_resources; | 509 | dma->device_free_chan_resources = moxart_free_chan_resources; |
532 | dma->device_issue_pending = moxart_issue_pending; | 510 | dma->device_issue_pending = moxart_issue_pending; |
533 | dma->device_tx_status = moxart_tx_status; | 511 | dma->device_tx_status = moxart_tx_status; |
534 | dma->device_control = moxart_control; | 512 | dma->device_config = moxart_slave_config; |
513 | dma->device_terminate_all = moxart_terminate_all; | ||
535 | dma->dev = dev; | 514 | dma->dev = dev; |
536 | 515 | ||
537 | INIT_LIST_HEAD(&dma->channels); | 516 | INIT_LIST_HEAD(&dma->channels); |