Commit 7e910357 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by David S. Miller

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: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14956643
...@@ -2551,12 +2551,12 @@ idt77252_close(struct atm_vcc *vcc) ...@@ -2551,12 +2551,12 @@ idt77252_close(struct atm_vcc *vcc)
timeout = 5 * 1000; timeout = 5 * 1000;
while (atomic_read(&vc->scq->used) > 0) { while (atomic_read(&vc->scq->used) > 0) {
timeout = msleep_interruptible(timeout); 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; 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); writel(TCMDQ_HALT | vc->index, SAR_REG_TCMDQ);
clear_scd(card, vc->scq, vc->class); clear_scd(card, vc->scq, vc->class);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment