From d96739499ce957831e7bb12ac290da77b3d1f5fe Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Thu, 2 Jun 2011 20:03:06 +0000 Subject: wctdm24xxp: Trivial. Reduce the indentation level in wctdm_proslic_oppending. Signed-off-by: Shaun Ruffell git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9959 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctdm24xxp/base.c | 57 +++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 28 deletions(-) (limited to 'drivers/dahdi/wctdm24xxp') diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index efbdedf..4f5363b 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1277,39 +1277,40 @@ static inline void wctdm_proslic_check_oppending(struct wctdm *wc, int card) struct fxs *const fxs = &mod->mod.fxs; int res; + if (!(fxs->lasttxhook & SLIC_LF_OPPENDING)) + return; + /* Monitor the Pending LF state change, for the next 100ms */ - if (fxs->lasttxhook & SLIC_LF_OPPENDING) { - spin_lock(&fxs->lasttxhooklock); + spin_lock(&fxs->lasttxhooklock); - if (!(fxs->lasttxhook & SLIC_LF_OPPENDING)) { - spin_unlock(&fxs->lasttxhooklock); - return; - } + if (!(fxs->lasttxhook & SLIC_LF_OPPENDING)) { + spin_unlock(&fxs->lasttxhooklock); + return; + } - res = mod->cmdq.isrshadow[1]; - if ((res & SLIC_LF_SETMASK) == (fxs->lasttxhook & SLIC_LF_SETMASK)) { - fxs->lasttxhook &= SLIC_LF_SETMASK; - fxs->oppending_ms = 0; - if (debug & DEBUG_CARD) { - dev_info(&wc->vb.pdev->dev, - "SLIC_LF OK: card=%d shadow=%02x " - "lasttxhook=%02x intcount=%d\n", card, - res, fxs->lasttxhook, wc->intcount); - } - } else if (fxs->oppending_ms && (--fxs->oppending_ms == 0)) { - /* Timed out, resend the linestate */ - mod->sethook = CMD_WR(LINE_STATE, fxs->lasttxhook); - if (debug & DEBUG_CARD) { - dev_info(&wc->vb.pdev->dev, - "SLIC_LF RETRY: card=%d shadow=%02x " - "lasttxhook=%02x intcount=%d\n", card, - res, fxs->lasttxhook, wc->intcount); - } - } else { /* Start 100ms Timeout */ - fxs->oppending_ms = 100; + res = mod->cmdq.isrshadow[1]; + if ((res & SLIC_LF_SETMASK) == (fxs->lasttxhook & SLIC_LF_SETMASK)) { + fxs->lasttxhook &= SLIC_LF_SETMASK; + fxs->oppending_ms = 0; + if (debug & DEBUG_CARD) { + dev_info(&wc->vb.pdev->dev, + "SLIC_LF OK: card=%d shadow=%02x " + "lasttxhook=%02x intcount=%d\n", card, + res, fxs->lasttxhook, wc->intcount); } - spin_unlock(&fxs->lasttxhooklock); + } else if (fxs->oppending_ms && (--fxs->oppending_ms == 0)) { + /* Timed out, resend the linestate */ + mod->sethook = CMD_WR(LINE_STATE, fxs->lasttxhook); + if (debug & DEBUG_CARD) { + dev_info(&wc->vb.pdev->dev, + "SLIC_LF RETRY: card=%d shadow=%02x " + "lasttxhook=%02x intcount=%d\n", card, + res, fxs->lasttxhook, wc->intcount); + } + } else { /* Start 100ms Timeout */ + fxs->oppending_ms = 100; } + spin_unlock(&fxs->lasttxhooklock); } /* 256ms interrupt */ -- cgit v1.2.3