Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / dma / mv_xor.c

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index a25f5f6..954e334 100644 (file)
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -671,7 +671,7 @@ mv_xor_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
        if (unlikely(len < MV_XOR_MIN_BYTE_COUNT))
                return NULL;
 
-       BUG_ON(unlikely(len > MV_XOR_MAX_BYTE_COUNT));
+       BUG_ON(len > MV_XOR_MAX_BYTE_COUNT);
 
        spin_lock_bh(&mv_chan->lock);
        slot_cnt = mv_chan_memcpy_slot_count(len);
@@ -710,7 +710,7 @@ mv_xor_prep_dma_memset(struct dma_chan *chan, dma_addr_t dest, int value,
        if (unlikely(len < MV_XOR_MIN_BYTE_COUNT))
                return NULL;
 
-       BUG_ON(unlikely(len > MV_XOR_MAX_BYTE_COUNT));
+       BUG_ON(len > MV_XOR_MAX_BYTE_COUNT);
 
        spin_lock_bh(&mv_chan->lock);
        slot_cnt = mv_chan_memset_slot_count(len);
@@ -744,7 +744,7 @@ mv_xor_prep_dma_xor(struct dma_chan *chan, dma_addr_t dest, dma_addr_t *src,
        if (unlikely(len < MV_XOR_MIN_BYTE_COUNT))
                return NULL;
 
-       BUG_ON(unlikely(len > MV_XOR_MAX_BYTE_COUNT));
+       BUG_ON(len > MV_XOR_MAX_BYTE_COUNT);
 
        dev_dbg(mv_chan->device->common.dev,
                "%s src_cnt: %d len: dest %x %u flags: %ld\n",