zfcp: restore: Dont use 0 to indicate invalid LUN in rec trace

[pandora-kernel.git] / drivers / dma / iop-adma.c

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index c6b01f5..e03f811 100644 (file)
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -619,7 +619,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,
 
        if (unlikely(!len))
                return NULL;
-       BUG_ON(unlikely(len > IOP_ADMA_MAX_BYTE_COUNT));
+       BUG_ON(len > IOP_ADMA_MAX_BYTE_COUNT);
 
        dev_dbg(iop_chan->device->common.dev, "%s len: %u\n",
                __func__, len);
@@ -652,7 +652,7 @@ iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest,
 
        if (unlikely(!len))
                return NULL;
-       BUG_ON(unlikely(len > IOP_ADMA_MAX_BYTE_COUNT));
+       BUG_ON(len > IOP_ADMA_MAX_BYTE_COUNT);
 
        dev_dbg(iop_chan->device->common.dev, "%s len: %u\n",
                __func__, len);
@@ -686,7 +686,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,
 
        if (unlikely(!len))
                return NULL;
-       BUG_ON(unlikely(len > IOP_ADMA_XOR_MAX_BYTE_COUNT));
+       BUG_ON(len > IOP_ADMA_XOR_MAX_BYTE_COUNT);
 
        dev_dbg(iop_chan->device->common.dev,
                "%s src_cnt: %d len: %u flags: %lx\n",