diff options
| author |   Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-17 14:42:40 +0100 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2014-12-22 12:33:22 +0530 |
| commit | c91781b44e2bf4770f894c80cbe99e3404b690fb (patch) | |
| tree | ce7c3def7b9165ca8a7a7c747b444ea1b8078066 /drivers/dma/pch_dma.c | |
| parent | dmaengine: mv_xor: Remove device_control (diff) | |
| download | linux-dev-c91781b44e2bf4770f894c80cbe99e3404b690fb.tar.xz linux-dev-c91781b44e2bf4770f894c80cbe99e3404b690fb.zip | |
dmaengine: pch-dma: Rename device_control
Rename the device_control callback of the Intel PCH 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>
Diffstat (limited to 'drivers/dma/pch_dma.c')
| -rw-r--r-- | drivers/dma/pch_dma.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c index 6e0e47d76b23..35c143cb88da 100644 --- a/drivers/dma/pch_dma.c +++ b/drivers/dma/pch_dma.c @@ -665,16 +665,12 @@ err_desc_get: return NULL; } -static int pd_device_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, - unsigned long arg) +static int pd_device_terminate_all(struct dma_chan *chan) { struct pch_dma_chan *pd_chan = to_pd_chan(chan); struct pch_dma_desc *desc, *_d; LIST_HEAD(list); - if (cmd != DMA_TERMINATE_ALL) - return -ENXIO; - spin_lock_irq(&pd_chan->lock); pdc_set_mode(&pd_chan->chan, DMA_CTL0_DISABLE); @@ -932,7 +928,7 @@ static int pch_dma_probe(struct pci_dev *pdev, pd->dma.device_tx_status = pd_tx_status; pd->dma.device_issue_pending = pd_issue_pending; pd->dma.device_prep_slave_sg = pd_prep_slave_sg; - pd->dma.device_control = pd_device_control; + pd->dma.device_terminate_all = pd_device_terminate_all; err = dma_async_device_register(&pd->dma); if (err) { |