lkml.org 
[lkml]   [2015]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 090/126] dmaengine: dw: convert to __ffs()
    Date
    3.16.7-ckt21 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    commit 39416677b95bf1ab8bbfa229ec7e511c96ad5d0c upstream.

    We replace __fls() by __ffs() since we have to find a *minimum* data width that
    satisfies both source and destination.

    While here, rename dwc_fast_fls() to dwc_fast_ffs() which it really is.

    Fixes: 4c2d56c574db (dw_dmac: introduce dwc_fast_fls())
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Vinod Koul <vinod.koul@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/dma/dw/core.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
    index a1315dd54514..b37d58f4cc93 100644
    --- a/drivers/dma/dw/core.c
    +++ b/drivers/dma/dw/core.c
    @@ -176,7 +176,7 @@ static void dwc_initialize(struct dw_dma_chan *dwc)

    /*----------------------------------------------------------------------*/

    -static inline unsigned int dwc_fast_fls(unsigned long long v)
    +static inline unsigned int dwc_fast_ffs(unsigned long long v)
    {
    /*
    * We can be a lot more clever here, but this should take care
    @@ -720,7 +720,7 @@ dwc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
    dw->data_width[dwc->dst_master]);

    src_width = dst_width = min_t(unsigned int, data_width,
    - dwc_fast_fls(src | dest | len));
    + dwc_fast_ffs(src | dest | len));

    ctllo = DWC_DEFAULT_CTLLO(chan)
    | DWC_CTLL_DST_WIDTH(dst_width)
    @@ -799,7 +799,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

    switch (direction) {
    case DMA_MEM_TO_DEV:
    - reg_width = __fls(sconfig->dst_addr_width);
    + reg_width = __ffs(sconfig->dst_addr_width);
    reg = sconfig->dst_addr;
    ctllo = (DWC_DEFAULT_CTLLO(chan)
    | DWC_CTLL_DST_WIDTH(reg_width)
    @@ -819,7 +819,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
    len = sg_dma_len(sg);

    mem_width = min_t(unsigned int,
    - data_width, dwc_fast_fls(mem | len));
    + data_width, dwc_fast_ffs(mem | len));

    slave_sg_todev_fill_desc:
    desc = dwc_desc_get(dwc);
    @@ -859,7 +859,7 @@ slave_sg_todev_fill_desc:
    }
    break;
    case DMA_DEV_TO_MEM:
    - reg_width = __fls(sconfig->src_addr_width);
    + reg_width = __ffs(sconfig->src_addr_width);
    reg = sconfig->src_addr;
    ctllo = (DWC_DEFAULT_CTLLO(chan)
    | DWC_CTLL_SRC_WIDTH(reg_width)
    @@ -879,7 +879,7 @@ slave_sg_todev_fill_desc:
    len = sg_dma_len(sg);

    mem_width = min_t(unsigned int,
    - data_width, dwc_fast_fls(mem | len));
    + data_width, dwc_fast_ffs(mem | len));

    slave_sg_fromdev_fill_desc:
    desc = dwc_desc_get(dwc);

    \
     
     \ /
      Last update: 2015-12-09 11:21    [W:4.967 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site