FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-12 23:22:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dmaengine: pch-dma: Rename device_control

Browse Source 
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>
This commit is contained in:
Maxime Ripard 2014-11-17 14:42:40 +01:00 committed by Vinod Koul
parent 581dc2ccb1
commit c91781b44e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma/pch_dma.c
View File

@ -665,16 +665,12 @@ err_desc_get:
return NULL; return NULL;
} }
static int pd_device_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, static int pd_device_terminate_all(struct dma_chan *chan)
unsigned long arg)
{ {
struct pch_dma_chan *pd_chan = to_pd_chan(chan); struct pch_dma_chan *pd_chan = to_pd_chan(chan);
struct pch_dma_desc *desc, *_d; struct pch_dma_desc *desc, *_d;
LIST_HEAD(list); LIST_HEAD(list);
if (cmd != DMA_TERMINATE_ALL)
return -ENXIO;
spin_lock_irq(&pd_chan->lock); spin_lock_irq(&pd_chan->lock);
pdc_set_mode(&pd_chan->chan, DMA_CTL0_DISABLE); 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_tx_status = pd_tx_status;
pd->dma.device_issue_pending = pd_issue_pending; pd->dma.device_issue_pending = pd_issue_pending;
pd->dma.device_prep_slave_sg = pd_prep_slave_sg; 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); err = dma_async_device_register(&pd->dma);
if (err) { if (err) {