diff options
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_dummy.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/pciradio.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/tor2.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wcfxo.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wct1xxp.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wctdm.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wcte11xp.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 1 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 1 | ||||
-rw-r--r-- | include/dahdi/kernel.h | 1 |
14 files changed, 0 insertions, 17 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index a292619..0040d31 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -4675,9 +4675,6 @@ static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long da spin_unlock_irqrestore(&s->lock, flags); if (rv) return rv; - interruptible_sleep_on(&s->maintq); - if (signal_pending(current)) - return -ERESTARTSYS; spin_lock_irqsave(&s->lock, flags); break; case DAHDI_MAINT_FAS_DEFECT: @@ -8461,7 +8458,6 @@ int dahdi_transmit(struct dahdi_span *span) if (span->ops->maint) span->ops->maint(span, DAHDI_MAINT_LOOPSTOP); span->maintstat = 0; - wake_up_interruptible(&span->maintq); } } return 0; diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index 6768b47..bc26971 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -216,7 +216,6 @@ static int dahdi_dummy_initialize(struct dahdi_dummy *ztd) ztd->span.chans = &ztd->chan; ztd->span.channels = 0; /* no channels on our span */ ztd->span.deflaw = DAHDI_LAW_MULAW; - init_waitqueue_head(&ztd->span.maintq); ztd->chan->pvt = ztd; ztd->span.ops = &dummy_ops; if (dahdi_register(&ztd->span, 0)) { diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c index 3d69e5a..bbdd4cc 100644 --- a/drivers/dahdi/pciradio.c +++ b/drivers/dahdi/pciradio.c @@ -1488,7 +1488,6 @@ static int pciradio_initialize(struct pciradio *rad) rad->span.channels = rad->nchans; rad->span.flags = DAHDI_FLAG_RBS; rad->span.ops = &pciradio_span_ops; - init_waitqueue_head(&rad->span.maintq); if (dahdi_register(&rad->span, 0)) { printk(KERN_NOTICE "Unable to register span with DAHDI\n"); diff --git a/drivers/dahdi/tor2.c b/drivers/dahdi/tor2.c index 93e0dbd..b181e3f 100644 --- a/drivers/dahdi/tor2.c +++ b/drivers/dahdi/tor2.c @@ -304,7 +304,6 @@ static void init_spans(struct tor2 *tor) tor->tspans[x].tor = tor; tor->tspans[x].span = x; - init_waitqueue_head(&s->maintq); for (y = 0; y < s->channels; y++) { struct dahdi_chan *mychans = tor->chans[x][y]; sprintf(mychans->name, "Tor2/%d/%d/%d", tor->num, x + 1, y + 1); diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index e4a6dca..172c0a4 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -2415,7 +2415,6 @@ static void init_spans(struct b4xxp *b4) bspan->sigactive = 0; bspan->span.chans = bspan->chans; - init_waitqueue_head(&bspan->span.maintq); /* now initialize each channel in the span */ for (j=0; j < WCB4XXP_CHANNELS_PER_SPAN; j++) { diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c index 7893c87..2e8cc39 100644 --- a/drivers/dahdi/wcfxo.c +++ b/drivers/dahdi/wcfxo.c @@ -666,7 +666,6 @@ static int wcfxo_initialize(struct wcfxo *wc) #ifdef ENABLE_TASKLETS tasklet_init(&wc->wcfxo_tlet, wcfxo_tasklet, (unsigned long)wc); #endif - init_waitqueue_head(&wc->span.maintq); wc->chan->pvt = wc; wc->span.ops = &wcfxo_span_ops; diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c index e5ed794..2650242 100644 --- a/drivers/dahdi/wct1xxp.c +++ b/drivers/dahdi/wct1xxp.c @@ -792,7 +792,6 @@ static int t1xxp_software_init(struct t1xxp *wc) wc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4 | DAHDI_CONFIG_ESF; wc->span.spantype = "T1"; } - init_waitqueue_head(&wc->span.maintq); for (x=0;x<wc->span.channels;x++) { sprintf(wc->chans[x]->name, "WCT1/%d/%d", wc->num, x + 1); wc->chans[x]->sigcap = DAHDI_SIG_EM | DAHDI_SIG_CLEAR | DAHDI_SIG_EM_E1 | diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 27ed951..b83e53b 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -2129,7 +2129,6 @@ static void init_spans(struct t4 *wc) ts->span.offset = x; ts->writechunk = (void *)(wc->writechunk + x * 32 * 2); ts->readchunk = (void *)(wc->readchunk + x * 32 * 2); - init_waitqueue_head(&ts->span.maintq); if (gen2) { ts->span.ops = &t4_gen2_span_ops; diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c index 7ab1e32..d32a038 100644 --- a/drivers/dahdi/wctdm.c +++ b/drivers/dahdi/wctdm.c @@ -2389,7 +2389,6 @@ static int wctdm_initialize(struct wctdm *wc) wc->span.channels = NUM_CARDS; wc->span.irq = wc->dev->irq; wc->span.flags = DAHDI_FLAG_RBS; - init_waitqueue_head(&wc->span.maintq); wc->span.ops = &wctdm_span_ops; if (dahdi_register(&wc->span, 0)) { diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index e6628ae..18ea309 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -3828,7 +3828,6 @@ static struct wctdm_span *wctdm_init_span(struct wctdm *wc, int spanno, int chan wc->chans[chanoffset + 2]->chan.sigcap = DAHDI_SIG_HARDHDLC; } - init_waitqueue_head(&s->span.maintq); wc->spans[spanno] = s; return s; } diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c index bb50cd9..204eff5 100644 --- a/drivers/dahdi/wcte11xp.c +++ b/drivers/dahdi/wcte11xp.c @@ -1004,7 +1004,6 @@ static int t1xxp_software_init(struct t1 *wc) } wc->span.chans = wc->chans; wc->span.flags = DAHDI_FLAG_RBS; - init_waitqueue_head(&wc->span.maintq); for (x=0;x<wc->span.channels;x++) { sprintf(wc->chans[x]->name, "WCT1/%d/%d", wc->num, x + 1); wc->chans[x]->sigcap = DAHDI_SIG_EM | DAHDI_SIG_CLEAR | DAHDI_SIG_EM_E1 | diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index a443ef7..9870aaf 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1592,7 +1592,6 @@ static int t1_software_init(struct t1 *wc) } wc->span.chans = wc->chans; set_bit(DAHDI_FLAGBIT_RBS, &wc->span.flags); - init_waitqueue_head(&wc->span.maintq); for (x = 0; x < wc->span.channels; x++) { sprintf(wc->chans[x]->name, "WCT1/%d/%d", num, x + 1); t1_chan_set_sigcap(&wc->span, x); diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 6bc0663..ea5229d 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -1113,7 +1113,6 @@ int dahdi_register_xpd(xpd_t *xpd) span = &xpd->span; snprintf(span->name, MAX_SPANNAME, "%s/%s", xbus->busname, xpd->xpdname); span->deflaw = DAHDI_LAW_MULAW; /* default, may be overriden by card_* drivers */ - init_waitqueue_head(&span->maintq); span->channels = cn; span->chans = xpd->chans; diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index ac5f3ee..6b7df0c 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -879,7 +879,6 @@ struct dahdi_span { struct dahdi_count count; /*!< Performance and Error counters */ int maintstat; /*!< Maintenance state */ - wait_queue_head_t maintq; /*!< Maintenance queue */ int mainttimer; /*!< Maintenance timer */ int irqmisses; /*!< Interrupt misses */ |