mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dmaengine: Remove device_control and device_slave_caps 

Now that device_control has been split into several functions, and
device_slave_caps rendered useless, we can safely remove them.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Maxime Ripard 2014-11-17 14:42:54 +01:00 committed by Vinod Koul
parent ecc19d1786
commit 2c44ad914c
1 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/linux/dmaengine.h
View File

@ -188,25 +188,6 @@ enum dma_ctrl_flags {
DMA_PREP_FENCE = (1 << 5),
};
/**
* enum dma_ctrl_cmd - DMA operations that can optionally be exercised
* on a running channel.
* @DMA_TERMINATE_ALL: terminate all ongoing transfers
* @DMA_PAUSE: pause ongoing transfers
* @DMA_RESUME: resume paused transfer
* @DMA_SLAVE_CONFIG: this command is only implemented by DMA controllers
* that need to runtime reconfigure the slave channels (as opposed to passing
* configuration data in statically from the platform). An additional
* argument of struct dma_slave_config must be passed in with this
* command.
*/
enum dma_ctrl_cmd {
DMA_TERMINATE_ALL,
DMA_PAUSE,
DMA_RESUME,
DMA_SLAVE_CONFIG,
};
/**
* enum sum_check_bits - bit position of pq_check_flags
*/
@ -336,9 +317,8 @@ enum dma_slave_buswidth {
* This struct is passed in as configuration data to a DMA engine
* in order to set up a certain channel for DMA transport at runtime.
* The DMA device/engine has to provide support for an additional
* command in the channel config interface, DMA_SLAVE_CONFIG
* and this struct will then be passed in as an argument to the
* DMA engine device_control() function.
* callback in the dma_device structure, device_config and this struct
* will then be passed in as an argument to the function.
*
* The rationale for adding configuration information to this struct is as
* follows: if it is likely that more than one DMA slave controllers in
@ -618,8 +598,6 @@ struct dma_tx_state {
* @device_prep_interleaved_dma: Transfer expression in a generic way.
* @device_config: Pushes a new configuration to a channel, return 0 or an error
* code
* @device_control: manipulate all pending operations on a channel, returns
* zero or error code
* @device_pause: Pauses any transfer happening on a channel. Returns
* 0 or an error code
* @device_resume: Resumes any transfer on a channel previously
@ -631,7 +609,6 @@ struct dma_tx_state {
* struct with auxiliary transfer status information, otherwise the call
* will just return a simple status code
* @device_issue_pending: push pending transactions to hardware
* @device_slave_caps: return the slave channel capabilities
*/
struct dma_device {
@ -698,8 +675,6 @@ struct dma_device {
int (*device_config)(struct dma_chan *chan,
struct dma_slave_config *config);
int (*device_control)(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
unsigned long arg);
int (*device_pause)(struct dma_chan *chan);
int (*device_resume)(struct dma_chan *chan);
int (*device_terminate_all)(struct dma_chan *chan);
@ -708,27 +683,15 @@ struct dma_device {
dma_cookie_t cookie,
struct dma_tx_state *txstate);
void (*device_issue_pending)(struct dma_chan *chan);
int (*device_slave_caps)(struct dma_chan *chan, struct dma_slave_caps *caps);
};
static inline int dmaengine_device_control(struct dma_chan *chan,
enum dma_ctrl_cmd cmd,
unsigned long arg)
{
if (chan->device->device_control)
return chan->device->device_control(chan, cmd, arg);
return -ENOSYS;
}
static inline int dmaengine_slave_config(struct dma_chan *chan,
struct dma_slave_config *config)
{
if (chan->device->device_config)
return chan->device->device_config(chan, config);
return dmaengine_device_control(chan, DMA_SLAVE_CONFIG,
(unsigned long)config);
return -ENOSYS;
}
static inline bool is_slave_direction(enum dma_transfer_direction direction)
@ -808,9 +771,6 @@ static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_cap
if (!test_bit(DMA_SLAVE, device->cap_mask.bits))
return -ENXIO;
if (device->device_slave_caps)
return device->device_slave_caps(chan, caps);
/*
* Check whether it reports it uses the generic slave
* capabilities, if not, that means it doesn't support any
@ -835,7 +795,7 @@ static inline int dmaengine_terminate_all(struct dma_chan *chan)
if (chan->device->device_terminate_all)
return chan->device->device_terminate_all(chan);
return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0);
return -ENOSYS;
}
static inline int dmaengine_pause(struct dma_chan *chan)
@ -843,7 +803,7 @@ static inline int dmaengine_pause(struct dma_chan *chan)
if (chan->device->device_pause)
return chan->device->device_pause(chan);
return dmaengine_device_control(chan, DMA_PAUSE, 0);
return -ENOSYS;
}
static inline int dmaengine_resume(struct dma_chan *chan)
@ -851,7 +811,7 @@ static inline int dmaengine_resume(struct dma_chan *chan)
if (chan->device->device_resume)
return chan->device->device_resume(chan);
return dmaengine_device_control(chan, DMA_RESUME, 0);
return -ENOSYS;
}
static inline enum dma_status dmaengine_tx_status(struct dma_chan *chan,