From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754062Ab1AZS3J (ORCPT ); Wed, 26 Jan 2011 13:29:09 -0500 Received: from [123.122.106.155] ([123.122.106.155]:38827 "EHLO enigma.site" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753537Ab1AZS3G (ORCPT ); Wed, 26 Jan 2011 13:29:06 -0500 From: Coly Li To: linux-kernel@vger.kernel.org Cc: Coly Li , Greg KH Subject: [PATCH 3/6] dma: use BUG_ON correctly in mv_xor.c Date: Thu, 27 Jan 2011 02:54:52 +0800 Message-Id: <1296068095-16988-4-git-send-email-bosong.ly@taobao.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1296068095-16988-1-git-send-email-bosong.ly@taobao.com> References: <1296068095-16988-1-git-send-email-bosong.ly@taobao.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch mekes BUG_ON() usage correct in drivers/dma/mv_xor.c Signed-off-by: Coly Li Cc: Greg KH --- drivers/dma/mv_xor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index a25f5f6..954e334 100644 --- 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", -- 1.7.3.2