lkml.org 
[lkml]   [2014]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 48/53] dmaengine: nbpfaxi: Declare slave capabilities for the generic code
    Date
    Now that the generic slave caps code can make use of the device assigned
    capabilities, instead of relying on a callback to be implemented.

    Make use of this code.

    Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    ---
    drivers/dma/nbpfaxi.c | 18 +++++-------------
    1 file changed, 5 insertions(+), 13 deletions(-)

    diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
    index 2585bfd317a7..93c52696c409 100644
    --- a/drivers/dma/nbpfaxi.c
    +++ b/drivers/dma/nbpfaxi.c
    @@ -1070,18 +1070,6 @@ static void nbpf_free_chan_resources(struct dma_chan *dchan)
    }
    }

    -static int nbpf_slave_caps(struct dma_chan *dchan,
    - struct dma_slave_caps *caps)
    -{
    - caps->src_addr_widths = NBPF_DMA_BUSWIDTHS;
    - caps->dst_addr_widths = NBPF_DMA_BUSWIDTHS;
    - caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
    - caps->cmd_pause = false;
    - caps->cmd_terminate = true;
    -
    - return 0;
    -}
    -
    static struct dma_chan *nbpf_of_xlate(struct of_phandle_args *dma_spec,
    struct of_dma *ofdma)
    {
    @@ -1412,7 +1400,6 @@ static int nbpf_probe(struct platform_device *pdev)
    dma_dev->device_prep_dma_memcpy = nbpf_prep_memcpy;
    dma_dev->device_tx_status = nbpf_tx_status;
    dma_dev->device_issue_pending = nbpf_issue_pending;
    - dma_dev->device_slave_caps = nbpf_slave_caps;

    /*
    * If we drop support for unaligned MEMCPY buffer addresses and / or
    @@ -1428,6 +1415,11 @@ static int nbpf_probe(struct platform_device *pdev)
    dma_dev->device_pause = nbpf_pause;
    dma_dev->device_terminate_all = nbpf_terminate_all;

    + dma_dev->src_addr_widths = NBPF_DMA_BUSWIDTHS;
    + dma_dev->dst_addr_widths = NBPF_DMA_BUSWIDTHS;
    + dma_dev->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
    + dma_dev->generic_slave_caps = true;
    +
    platform_set_drvdata(pdev, nbpf);

    ret = clk_prepare_enable(nbpf->clk);
    --
    2.1.1


    \
     
     \ /
      Last update: 2014-10-16 13:01    [W:2.873 / U:1.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site