Commit 7e910357 authored May 19, 2014 by Peter Senna Tschudin Committed by David S. Miller May 21, 2014

atm: idt77252: Remove redundant error check



Remove double checks, convert printk to pr_warn, and move the call to
pr_warn to the first check. The simplified version of the coccinelle
semantic patch that find this issue is as follows:

// <smpl>
@@
expression E; identifier pr; expression list es;
@@
while(...){
...
-       if (E) break;
+       if (E){
+               pr(es);
+               break;
+       }
...
}
- if(E) pr(es);
// </smpl>

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 14956643

drivers/atm/idt77252.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2551,12 +2551,12 @@ done:
		timeout = 5 * 1000;
		while (atomic_read(&vc->scq->used) > 0) {
		timeout = msleep_interruptible(timeout);
		if (!timeout)
		if (!timeout) {
		pr_warn("%s: SCQ drain timeout: %u used\n",
		card->name, atomic_read(&vc->scq->used));
		break;
		}
		if (!timeout)
		printk("%s: SCQ drain timeout: %u used\n",
		card->name, atomic_read(&vc->scq->used));
		}

		writel(TCMDQ_HALT \| vc->index, SAR_REG_TCMDQ);
		clear_scd(card, vc->scq, vc->class);

Admin message