Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dmaengine: ep93xx: Split device_control

Browse source 
Split the device_control callback of the Cirrus Logic EP93xx 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>
This commit is contained in:
Maxime Ripard 2014-11-17 14:42:14 +01:00 committed by Vinod Koul
parent aa7c09b65b
commit 2258b67543
1 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/dma/ep93xx_dma.c
View file

@ -1164,13 +1164,14 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
/** /**
* ep93xx_dma_terminate_all - terminate all transactions * ep93xx_dma_terminate_all - terminate all transactions
* @edmac: channel * @chan: channel
* *
* Stops all DMA transactions. All descriptors are put back to the * Stops all DMA transactions. All descriptors are put back to the
* @edmac->free_list and callbacks are _not_ called. * @edmac->free_list and callbacks are _not_ called.
*/ */
static int ep93xx_dma_terminate_all(struct ep93xx_dma_chan *edmac) static int ep93xx_dma_terminate_all(struct dma_chan *chan)
{ {
struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
struct ep93xx_dma_desc *desc, *_d; struct ep93xx_dma_desc *desc, *_d;
unsigned long flags; unsigned long flags;
LIST_HEAD(list); LIST_HEAD(list);
@ -1194,9 +1195,10 @@ static int ep93xx_dma_terminate_all(struct ep93xx_dma_chan *edmac)
return 0; return 0;
} }
static int ep93xx_dma_slave_config(struct ep93xx_dma_chan *edmac, static int ep93xx_dma_slave_config(struct dma_chan *chan,
struct dma_slave_config *config) struct dma_slave_config *config)
{ {
struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
enum dma_slave_buswidth width; enum dma_slave_buswidth width;
unsigned long flags; unsigned long flags;
u32 addr, ctrl; u32 addr, ctrl;
@ -1241,36 +1243,6 @@ static int ep93xx_dma_slave_config(struct ep93xx_dma_chan *edmac,
return 0; return 0;
} }
/**
* ep93xx_dma_control - manipulate all pending operations on a channel
* @chan: channel
* @cmd: control command to perform
* @arg: optional argument
*
* Controls the channel. Function returns %0 in case of success or negative
* error in case of failure.
*/
static int ep93xx_dma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
unsigned long arg)
{
struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
struct dma_slave_config *config;
switch (cmd) {
case DMA_TERMINATE_ALL:
return ep93xx_dma_terminate_all(edmac);
case DMA_SLAVE_CONFIG:
config = (struct dma_slave_config *)arg;
return ep93xx_dma_slave_config(edmac, config);
default:
break;
}
return -ENOSYS;
}
/** /**
* ep93xx_dma_tx_status - check if a transaction is completed * ep93xx_dma_tx_status - check if a transaction is completed
* @chan: channel * @chan: channel
@ -1352,7 +1324,8 @@ static int __init ep93xx_dma_probe(struct platform_device *pdev)
dma_dev->device_free_chan_resources = ep93xx_dma_free_chan_resources; dma_dev->device_free_chan_resources = ep93xx_dma_free_chan_resources;
dma_dev->device_prep_slave_sg = ep93xx_dma_prep_slave_sg; dma_dev->device_prep_slave_sg = ep93xx_dma_prep_slave_sg;
dma_dev->device_prep_dma_cyclic = ep93xx_dma_prep_dma_cyclic; dma_dev->device_prep_dma_cyclic = ep93xx_dma_prep_dma_cyclic;
dma_dev->device_control = ep93xx_dma_control; dma_dev->device_config = ep93xx_dma_slave_config;
dma_dev->device_terminate_all = ep93xx_dma_terminate_all;
dma_dev->device_issue_pending = ep93xx_dma_issue_pending; dma_dev->device_issue_pending = ep93xx_dma_issue_pending;
dma_dev->device_tx_status = ep93xx_dma_tx_status; dma_dev->device_tx_status = ep93xx_dma_tx_status;