1 files changed, 9 insertions, 23 deletions

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index cfaacaf6bf5f..22ea67eea5dc 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -629,11 +629,9 @@ static void build_rdma0_msg(struct nes_cm_node *cm_node, struct nes_qp **nesqp_a
 
         case SEND_RDMA_READ_ZERO:
         default:
-                if (cm_node->send_rdma0_op != SEND_RDMA_READ_ZERO) {
-                        printk(KERN_ERR "%s[%u]: Unsupported RDMA0 len operation=%u\n",
-                                 __func__, __LINE__, cm_node->send_rdma0_op);
-                        WARN_ON(1);
-                }
+                if (cm_node->send_rdma0_op != SEND_RDMA_READ_ZERO)
+                        WARN(1, "Unsupported RDMA0 len operation=%u\n",
+                             cm_node->send_rdma0_op);
                 nes_debug(NES_DBG_CM, "Sending first rdma operation.\n");
                 wqe->wqe_words[NES_IWARP_SQ_WQE_MISC_IDX] =
                         cpu_to_le32(NES_IWARP_SQ_OP_RDMAR);
@@ -671,7 +669,6 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct sk_buff *skb,
         struct nes_cm_core *cm_core = cm_node->cm_core;
         struct nes_timer_entry *new_send;
         int ret = 0;
-        u32 was_timer_set;
 
         new_send = kzalloc(sizeof(*new_send), GFP_ATOMIC);
         if (!new_send)
@@ -723,12 +720,8 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct sk_buff *skb,
                 }
         }
 
-        was_timer_set = timer_pending(&cm_core->tcp_timer);
-
-        if (!was_timer_set) {
-                cm_core->tcp_timer.expires = new_send->timetosend;
-                add_timer(&cm_core->tcp_timer);
-        }
+        if (!timer_pending(&cm_core->tcp_timer))
+                mod_timer(&cm_core->tcp_timer, new_send->timetosend);
 
         return ret;
 }
@@ -946,10 +939,8 @@ static void nes_cm_timer_tick(unsigned long pass)
         }
 
         if (settimer) {
-                if (!timer_pending(&cm_core->tcp_timer)) {
-                        cm_core->tcp_timer.expires = nexttimeout;
-                        add_timer(&cm_core->tcp_timer);
-                }
+                if (!timer_pending(&cm_core->tcp_timer))
+                        mod_timer(&cm_core->tcp_timer, nexttimeout);
         }
 }
 
@@ -1314,8 +1305,6 @@ static int mini_cm_del_listen(struct nes_cm_core *cm_core,
 static inline int mini_cm_accelerated(struct nes_cm_core *cm_core,
                                       struct nes_cm_node *cm_node)
 {
-        u32 was_timer_set;
-
         cm_node->accelerated = 1;
 
         if (cm_node->accept_pend) {
@@ -1325,11 +1314,8 @@ static inline int mini_cm_accelerated(struct nes_cm_core *cm_core,
                 BUG_ON(atomic_read(&cm_node->listener->pend_accepts_cnt) < 0);
         }
 
-        was_timer_set = timer_pending(&cm_core->tcp_timer);
-        if (!was_timer_set) {
-                cm_core->tcp_timer.expires = jiffies + NES_SHORT_TIME;
-                add_timer(&cm_core->tcp_timer);
-        }
+        if (!timer_pending(&cm_core->tcp_timer))
+                mod_timer(&cm_core->tcp_timer, (jiffies + NES_SHORT_TIME));
 
         return 0;
 }