Skip to content

Commit

Permalink
dmaengine: Move dma_get_slave_caps() implementation to dmaengine.c
Browse files Browse the repository at this point in the history
The function is too big to be a static inline.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Laurent Pinchart authored and Vinod Koul committed Jan 18, 2015
1 parent 816070e commit 0d5484b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 31 deletions.
33 changes: 33 additions & 0 deletions drivers/dma/dmaengine.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,39 @@ static void dma_channel_rebalance(void)
}
}

int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps)
{
struct dma_device *device;

if (!chan || !caps)
return -EINVAL;

device = chan->device;

/* check if the channel supports slave transactions */
if (!test_bit(DMA_SLAVE, device->cap_mask.bits))
return -ENXIO;

/*
* Check whether it reports it uses the generic slave
* capabilities, if not, that means it doesn't support any
* kind of slave capabilities reporting.
*/
if (!device->directions)
return -ENXIO;

caps->src_addr_widths = device->src_addr_widths;
caps->dst_addr_widths = device->dst_addr_widths;
caps->directions = device->directions;
caps->residue_granularity = device->residue_granularity;

caps->cmd_pause = !!device->device_pause;
caps->cmd_terminate = !!device->device_terminate_all;

return 0;
}
EXPORT_SYMBOL_GPL(dma_get_slave_caps);

static struct dma_chan *private_candidate(const dma_cap_mask_t *mask,
struct dma_device *dev,
dma_filter_fn fn, void *fn_param)
Expand Down
32 changes: 1 addition & 31 deletions include/linux/dmaengine.h
Original file line number Diff line number Diff line change
Expand Up @@ -758,37 +758,7 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg(
src_sg, src_nents, flags);
}

static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps)
{
struct dma_device *device;

if (!chan || !caps)
return -EINVAL;

device = chan->device;

/* check if the channel supports slave transactions */
if (!test_bit(DMA_SLAVE, device->cap_mask.bits))
return -ENXIO;

/*
* Check whether it reports it uses the generic slave
* capabilities, if not, that means it doesn't support any
* kind of slave capabilities reporting.
*/
if (!device->directions)
return -ENXIO;

caps->src_addr_widths = device->src_addr_widths;
caps->dst_addr_widths = device->dst_addr_widths;
caps->directions = device->directions;
caps->residue_granularity = device->residue_granularity;

caps->cmd_pause = !!device->device_pause;
caps->cmd_terminate = !!device->device_terminate_all;

return 0;
}
int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps);

static inline int dmaengine_terminate_all(struct dma_chan *chan)
{
Expand Down

0 comments on commit 0d5484b

Please sign in to comment.