lkml.org 
[lkml]   [2011]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] dma: use BUG_ON correctly in ppc4xx/adam.c, v4
    Date
    This patch makes BUG_ON() usage correct in drivers/dma/ppc4xx/adam.c

    Cc: Vinod Koul <vinod.koul@intel.com>
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Grant Likely <grant.likely@secretlab.ca>
    Cc: Anatolij Gustschin <agust@denx.de>
    Cc: Sean MacLennan <smaclennan@pikatech.com>
    Cc: Joe Perches <joe@perches.com>
    Signed-off-by: Coly Li <bosong.ly@taobao.com>
    ---
    drivers/dma/ppc4xx/adma.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
    index cef5845..a2b62e9 100644
    --- a/drivers/dma/ppc4xx/adma.c
    +++ b/drivers/dma/ppc4xx/adma.c
    @@ -2313,7 +2313,7 @@ static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memcpy(
    if (unlikely(!len))
    return NULL;

    - BUG_ON(unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT));
    + BUG_ON(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT);

    spin_lock_bh(&ppc440spe_chan->lock);

    @@ -2354,7 +2354,7 @@ static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memset(
    if (unlikely(!len))
    return NULL;

    - BUG_ON(unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT));
    + BUG_ON(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT);

    spin_lock_bh(&ppc440spe_chan->lock);

    @@ -2397,7 +2397,7 @@ static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_xor(
    dma_dest, dma_src, src_cnt));
    if (unlikely(!len))
    return NULL;
    - BUG_ON(unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT));
    + BUG_ON(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT);

    dev_dbg(ppc440spe_chan->device->common.dev,
    "ppc440spe adma%d: %s src_cnt: %d len: %u int_en: %d\n",
    @@ -2887,7 +2887,7 @@ static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_pq(
    ADMA_LL_DBG(prep_dma_pq_dbg(ppc440spe_chan->device->id,
    dst, src, src_cnt));
    BUG_ON(!len);
    - BUG_ON(unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT));
    + BUG_ON(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT);
    BUG_ON(!src_cnt);

    if (src_cnt == 1 && dst[1] == src[0]) {
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-03-26 18:11    [W:0.020 / U:1.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site