Hi Maxime,
Thank you for the patch.
On Thursday 16 October 2014 12:17:04 Maxime Ripard wrote:
> Split out the terminate_all command from device_control to a dma_device
> callback. In order to preserve backward capability, still rely on
> device_control if no such callback has been implemented.
>
> Eventually, this will allow to create a generic dma_slave_caps callback.
I like eventually better than hopefully ;-)
> Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> include/linux/dmaengine.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
> index b89c8004fcd8..4d0294ec3567 100644
> --- a/include/linux/dmaengine.h
> +++ b/include/linux/dmaengine.h
> @@ -616,6 +616,8 @@ struct dma_tx_state {
> * 0 or an error code
> * @device_resume: Resumes any transfer on a channel previously
> * paused. Returns 0 or an error code
> + * @device_terminate_all: Aborts all transfers on a channel. Returns 0
> + * or an error code
> * @device_tx_status: poll for transaction completion, the optional
> * txstate parameter can be supplied with a pointer to get a
> * struct with auxiliary transfer status information, otherwise the call
> @@ -686,6 +688,7 @@ struct dma_device {
> 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);
> enum dma_status (*device_tx_status)(struct dma_chan *chan,
> dma_cookie_t cookie,
> struct dma_tx_state *txstate);
> @@ -784,6 +787,9 @@ static inline int dma_get_slave_caps(struct dma_chan
> *chan, struct dma_slave_cap
>
> 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);
> }
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
