From 8acdd8b1fc09d76b7d3210bacae1037d437f3926 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 25 Oct 2012 14:27:07 +0000 Subject: [PATCH] --- yaml --- r: 343657 b: refs/heads/master c: 5390f86796a1f444ca1a7ba7315951e26acd958d h: refs/heads/master i: 343655: eb405494b577e3976aa51cfa1c47ad9b0a0cd242 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/cxgb4/cm.c | 6 ++++-- trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c | 10 ---------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 78348d7fe0d6..8974a06aae75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76f267b7ad978fec755f74ada4020edcb7493657 +refs/heads/master: 5390f86796a1f444ca1a7ba7315951e26acd958d diff --git a/trunk/drivers/infiniband/hw/cxgb4/cm.c b/trunk/drivers/infiniband/hw/cxgb4/cm.c index 5de86968379d..6cfd4d8fd0bd 100644 --- a/trunk/drivers/infiniband/hw/cxgb4/cm.c +++ b/trunk/drivers/infiniband/hw/cxgb4/cm.c @@ -151,8 +151,9 @@ static void stop_ep_timer(struct c4iw_ep *ep) { PDBG("%s ep %p\n", __func__, ep); if (!timer_pending(&ep->timer)) { - WARN(1, "%s timer stopped when its not running! " + printk(KERN_ERR "%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); @@ -2550,8 +2551,9 @@ static void process_timeout(struct c4iw_ep *ep) __state_set(&ep->com, ABORTING); break; default: - WARN(1, "%s unexpected state ep %p tid %u state %u\n", + printk(KERN_ERR "%s unexpected state ep %p tid %u state %u\n", __func__, ep, ep->hwtid, ep->com.state); + WARN_ON(1); abort = 0; } mutex_unlock(&ep->com.mutex); diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c index 49b09c697c7c..be2a60e142b0 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c @@ -718,16 +718,6 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) if (ret) goto done; - /* - * we ignore most issues after reporting them, but have to specially - * handle hardware-disabled chips. - */ - if (ret == 2) { - /* unique error, known to ipath_init_one */ - ret = -EPERM; - goto done; - } - /* * We could bump this to allow for full rcvegrcnt + rcvtidcnt, * but then it no longer nicely fits power of two, and since