lkml.org 
[lkml]   [2014]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/59] dmaengine: Add device_terminate_all callback
    Date
    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.

    Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    ---
    include/linux/dmaengine.h | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
    index 4583c55f3355..b0efc805937a 100644
    --- a/include/linux/dmaengine.h
    +++ b/include/linux/dmaengine.h
    @@ -615,6 +615,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,
    @@ -795,6 +798,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);
    }

    --
    2.1.1


    \
     
     \ /
      Last update: 2014-10-22 18:41    [W:4.029 / U:0.716 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site