diff options
Diffstat (limited to 'drivers/dahdi/wctdm24xxp/xhfc.c')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/xhfc.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/dahdi/wctdm24xxp/xhfc.c b/drivers/dahdi/wctdm24xxp/xhfc.c index 187f7cf..aa090ac 100644 --- a/drivers/dahdi/wctdm24xxp/xhfc.c +++ b/drivers/dahdi/wctdm24xxp/xhfc.c @@ -2093,7 +2093,7 @@ static void b400m_enable_workqueues(struct wctdm *wc) spin_lock_irqsave(&wc->reglock, flags); for (i = 0; i < wc->mods_per_board; i += 4) { - if (wc->mods[i].type == MOD_TYPE_BRI) + if (wc->mods[i].type == BRI) b4s[numb4s++] = wc->mods[i].mod.bri; } spin_unlock_irqrestore(&wc->reglock, flags); @@ -2113,7 +2113,7 @@ static void b400m_disable_workqueues(struct wctdm *wc) spin_lock_irqsave(&wc->reglock, flags); for (i = 0; i < wc->mods_per_board; i += 4) { - if (wc->mods[i].type == MOD_TYPE_BRI) + if (wc->mods[i].type == BRI) b4s[numb4s++] = wc->mods[i].mod.bri; } spin_unlock_irqrestore(&wc->reglock, flags); @@ -2572,7 +2572,7 @@ static int b400m_probe(struct wctdm *wc, int modpos) /* which B400M in the system is this one? count all of them found so * far */ for (x = 0; x < modpos; x += 4) { - if (wc->mods[x].type == MOD_TYPE_BRI) + if (wc->mods[x].type == BRI) ++b4->b400m_no; } @@ -2630,32 +2630,32 @@ int wctdm_init_b400m(struct wctdm *wc, int card) int ret = 0; unsigned long flags; - if (wc->mods[card & 0xfc].type == MOD_TYPE_QRV) + if (wc->mods[card & 0xfc].type == QRV) return -2; if (!(card & 0x03)) { /* only init if at lowest port in module */ spin_lock_irqsave(&wc->reglock, flags); - wc->mods[card + 0].type = MOD_TYPE_BRI; - wc->mods[card + 1].type = MOD_TYPE_BRI; - wc->mods[card + 2].type = MOD_TYPE_BRI; - wc->mods[card + 3].type = MOD_TYPE_BRI; + wc->mods[card + 0].type = BRI; + wc->mods[card + 1].type = BRI; + wc->mods[card + 2].type = BRI; + wc->mods[card + 3].type = BRI; spin_unlock_irqrestore(&wc->reglock, flags); msleep(20); if (b400m_probe(wc, card) != 0) { spin_lock_irqsave(&wc->reglock, flags); - wc->mods[card + 0].type = MOD_TYPE_NONE; - wc->mods[card + 1].type = MOD_TYPE_NONE; - wc->mods[card + 2].type = MOD_TYPE_NONE; - wc->mods[card + 3].type = MOD_TYPE_NONE; + wc->mods[card + 0].type = NONE; + wc->mods[card + 1].type = NONE; + wc->mods[card + 2].type = NONE; + wc->mods[card + 3].type = NONE; spin_unlock_irqrestore(&wc->reglock, flags); ret = -2; } } else { /* for the "sub-cards" */ - if (wc->mods[card & 0xfc].type == MOD_TYPE_BRI) { + if (wc->mods[card & 0xfc].type == BRI) { spin_lock_irqsave(&wc->reglock, flags); - wc->mods[card].type = MOD_TYPE_BRI; + wc->mods[card].type = BRI; wc->mods[card].mod.bri = wc->mods[card & 0xfc].mod.bri; spin_unlock_irqrestore(&wc->reglock, flags); } else { @@ -2734,12 +2734,12 @@ void wctdm_unload_b400m(struct wctdm *wc, int card) destroy_workqueue(b4->xhfc_ws); - /* Set these to MOD_TYPE_NONE to ensure that our checkisr + /* Set these to NONE to ensure that our checkisr * routines are not entered */ - wc->mods[card].type = MOD_TYPE_NONE; - wc->mods[card + 1].type = MOD_TYPE_NONE; - wc->mods[card + 2].type = MOD_TYPE_NONE; - wc->mods[card + 3].type = MOD_TYPE_NONE; + wc->mods[card].type = NONE; + wc->mods[card + 1].type = NONE; + wc->mods[card + 2].type = NONE; + wc->mods[card + 3].type = NONE; wc->mods[card].mod.bri = NULL; wc->mods[card + 1].mod.bri = NULL; |