From c6761b308e2a279f353ecdbd6da856a3cd9fd467 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sat, 13 Feb 2010 15:54:03 +0100 Subject: [PATCH] --- yaml --- r: 185759 b: refs/heads/master c: f1acb878b6070941e844dfc4ca1b3b9e5a70426c h: refs/heads/master i: 185757: a2f94338ce43f5693fc998a1cb51370cfe03e990 185755: b9723869ce493af2041b76e2f5fabb09e4e73900 185751: fafc1bc2d5126da04b5d7ba7d707dca916eb52d4 185743: 3962f5168aece94f01c99ce92da2dd0d7333bbc6 185727: 3a939f95a4caebf446965117ae6dee64440270ad v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/hardware/iop3xx-adma.h | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index bfbcaf04a504..86115c57f802 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67b9124f734b22b30d9adf18c39fe795e2901070 +refs/heads/master: f1acb878b6070941e844dfc4ca1b3b9e5a70426c diff --git a/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h b/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h index 1a8c7279a28b..9b28f1243bdc 100644 --- a/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h @@ -366,8 +366,7 @@ static inline int iop_chan_xor_slot_count(size_t len, int src_cnt, slot_cnt += *slots_per_op; } - if (len) - slot_cnt += *slots_per_op; + slot_cnt += *slots_per_op; return slot_cnt; } @@ -389,8 +388,7 @@ static inline int iop_chan_zero_sum_slot_count(size_t len, int src_cnt, slot_cnt += *slots_per_op; } - if (len) - slot_cnt += *slots_per_op; + slot_cnt += *slots_per_op; return slot_cnt; } @@ -737,10 +735,8 @@ iop_desc_set_zero_sum_byte_count(struct iop_adma_desc_slot *desc, u32 len) i += slots_per_op; } while (len > IOP_ADMA_ZERO_SUM_MAX_BYTE_COUNT); - if (len) { - iter = iop_hw_desc_slot_idx(hw_desc, i); - iter->byte_count = len; - } + iter = iop_hw_desc_slot_idx(hw_desc, i); + iter->byte_count = len; } }