RDMA/cxgb3: use WARN
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 3 Nov 2012 10:58:29 +0000 (10:58 +0000)
committerRoland Dreier <roland@purestorage.com>
Mon, 26 Nov 2012 19:08:16 +0000 (11:08 -0800)
Use WARN rather than printk followed by WARN_ON(1), for conciseness.

A simplified version of the semantic patch that makes this transformation
is as follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression list es;
@@

-printk(
+WARN(1,
  es);
-WARN_ON(1);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
drivers/infiniband/hw/cxgb3/iwch_cm.c

index aaf88ef..3e094cd 100644 (file)
@@ -128,9 +128,8 @@ static void stop_ep_timer(struct iwch_ep *ep)
 {
        PDBG("%s ep %p\n", __func__, ep);
        if (!timer_pending(&ep->timer)) {
-               printk(KERN_ERR "%s timer stopped when its not running!  ep %p state %u\n",
+               WARN(1, "%s timer stopped when its not running!  ep %p state %u\n",
                        __func__, ep, ep->com.state);
-               WARN_ON(1);
                return;
        }
        del_timer_sync(&ep->timer);
@@ -1756,9 +1755,8 @@ static void ep_timeout(unsigned long arg)
                __state_set(&ep->com, ABORTING);
                break;
        default:
-               printk(KERN_ERR "%s unexpected state ep %p state %u\n",
+               WARN(1, "%s unexpected state ep %p state %u\n",
                        __func__, ep, ep->com.state);
-               WARN_ON(1);
                abort = 0;
        }
        spin_unlock_irqrestore(&ep->com.lock, flags);