2 files changed, 5 insertions, 9 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,
                 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;
         }
 }
 
diff --git a/arch/arm/mach-u300/include/mach/coh901318.h b/arch/arm/mach-u300/include/mach/coh901318.h
index f4cfee9c7d28..b8155b4e5ffa 100644
--- a/arch/arm/mach-u300/include/mach/coh901318.h
+++ b/arch/arm/mach-u300/include/mach/coh901318.h
@@ -53,7 +53,7 @@ struct coh901318_params {
  * struct coh_dma_channel - dma channel base
  * @name: ascii name of dma channel
  * @number: channel id number
- * @desc_nbr_max: number of preallocated descriptortors
+ * @desc_nbr_max: number of preallocated descriptors
  * @priority_high: prio of channel, 0 low otherwise high.
  * @param: configuration parameters
  * @dev_addr: physical address of periphal connected to channel