From 5520491d5a1d486817eed8ef8c23282ddc5d809d Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 3 Nov 2012 10:58:29 +0000 Subject: [PATCH] --- yaml --- r: 343659 b: refs/heads/master c: 5107c2a3d117de8219a53e622c0f1f1bc3f7d1ae h: refs/heads/master i: 343657: 8acdd8b1fc09d76b7d3210bacae1037d437f3926 343655: eb405494b577e3976aa51cfa1c47ad9b0a0cd242 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 72ccd9b903e7..b884604bdbc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9795bd708e37ed4154e838a1f4576192eeeacca +refs/heads/master: 5107c2a3d117de8219a53e622c0f1f1bc3f7d1ae diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c b/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c index aaf88ef9409c..3e094cd6a0e3 100644 --- a/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c @@ -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);