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 44/59] dmaengine: xilinx: Split device_control
    Date
    Split the device_control callback of the Xilinx VDMA 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>
    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    ---
    drivers/dma/xilinx/xilinx_vdma.c | 29 ++++++-----------------------
    1 file changed, 6 insertions(+), 23 deletions(-)

    diff --git a/drivers/dma/xilinx/xilinx_vdma.c b/drivers/dma/xilinx/xilinx_vdma.c
    index a6e64767186e..1df06b45c798 100644
    --- a/drivers/dma/xilinx/xilinx_vdma.c
    +++ b/drivers/dma/xilinx/xilinx_vdma.c
    @@ -996,13 +996,17 @@ error:
    * xilinx_vdma_terminate_all - Halt the channel and free descriptors
    * @chan: Driver specific VDMA Channel pointer
    */
    -static void xilinx_vdma_terminate_all(struct xilinx_vdma_chan *chan)
    +static int xilinx_vdma_terminate_all(struct dma_chan *dchan)
    {
    + struct xilinx_vdma_chan *chan = to_xilinx_chan(dchan);
    +
    /* Halt the DMA engine */
    xilinx_vdma_halt(chan);

    /* Remove and free all of the descriptors in the lists */
    xilinx_vdma_free_descriptors(chan);
    +
    + return 0;
    }

    /**
    @@ -1070,27 +1074,6 @@ int xilinx_vdma_channel_set_config(struct dma_chan *dchan,
    }
    EXPORT_SYMBOL(xilinx_vdma_channel_set_config);

    -/**
    - * xilinx_vdma_device_control - Configure DMA channel of the device
    - * @dchan: DMA Channel pointer
    - * @cmd: DMA control command
    - * @arg: Channel configuration
    - *
    - * Return: '0' on success and failure value on error
    - */
    -static int xilinx_vdma_device_control(struct dma_chan *dchan,
    - enum dma_ctrl_cmd cmd, unsigned long arg)
    -{
    - struct xilinx_vdma_chan *chan = to_xilinx_chan(dchan);
    -
    - if (cmd != DMA_TERMINATE_ALL)
    - return -ENXIO;
    -
    - xilinx_vdma_terminate_all(chan);
    -
    - return 0;
    -}
    -
    /* -----------------------------------------------------------------------------
    * Probe and remove
    */
    @@ -1295,7 +1278,7 @@ static int xilinx_vdma_probe(struct platform_device *pdev)
    xilinx_vdma_free_chan_resources;
    xdev->common.device_prep_interleaved_dma =
    xilinx_vdma_dma_prep_interleaved;
    - xdev->common.device_control = xilinx_vdma_device_control;
    + xdev->common.device_terminate_all = xilinx_vdma_terminate_all;
    xdev->common.device_tx_status = xilinx_vdma_tx_status;
    xdev->common.device_issue_pending = xilinx_vdma_issue_pending;

    --
    2.1.1


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