diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2010-02-13 09:54:03 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-03-01 00:22:12 -0500 |
commit | f1acb878b6070941e844dfc4ca1b3b9e5a70426c (patch) | |
tree | ee42486424fea38a50136f95379b4bc42d0c3d5f /arch/arm/include | |
parent | 67b9124f734b22b30d9adf18c39fe795e2901070 (diff) |
iop-adma: redundant/wrong tests in iop_*_count()?
When we reach the loop, len is at least 1, we only stay in the loop when
len is at least MAX_BYTE_COUNT + 1, MAX_BYTE_COUNT is subtracted in each
iteration. So when we leave the loop, or didn't take it, len is at least 1.
Testing whether len is non-zero appears redundant.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/hardware/iop3xx-adma.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h index 1a8c7279a28b..9b28f1243bdc 100644 --- a/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/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, | |||
366 | slot_cnt += *slots_per_op; | 366 | slot_cnt += *slots_per_op; |
367 | } | 367 | } |
368 | 368 | ||
369 | if (len) | 369 | slot_cnt += *slots_per_op; |
370 | slot_cnt += *slots_per_op; | ||
371 | 370 | ||
372 | return slot_cnt; | 371 | return slot_cnt; |
373 | } | 372 | } |
@@ -389,8 +388,7 @@ static inline int iop_chan_zero_sum_slot_count(size_t len, int src_cnt, | |||
389 | slot_cnt += *slots_per_op; | 388 | slot_cnt += *slots_per_op; |
390 | } | 389 | } |
391 | 390 | ||
392 | if (len) | 391 | slot_cnt += *slots_per_op; |
393 | slot_cnt += *slots_per_op; | ||
394 | 392 | ||
395 | return slot_cnt; | 393 | return slot_cnt; |
396 | } | 394 | } |
@@ -737,10 +735,8 @@ iop_desc_set_zero_sum_byte_count(struct iop_adma_desc_slot *desc, u32 len) | |||
737 | i += slots_per_op; | 735 | i += slots_per_op; |
738 | } while (len > IOP_ADMA_ZERO_SUM_MAX_BYTE_COUNT); | 736 | } while (len > IOP_ADMA_ZERO_SUM_MAX_BYTE_COUNT); |
739 | 737 | ||
740 | if (len) { | 738 | iter = iop_hw_desc_slot_idx(hw_desc, i); |
741 | iter = iop_hw_desc_slot_idx(hw_desc, i); | 739 | iter->byte_count = len; |
742 | iter->byte_count = len; | ||
743 | } | ||
744 | } | 740 | } |
745 | } | 741 | } |
746 | 742 | ||