diff options
| author | Noe Rubinstein <nrubinstein@proformatique.com> | 2010-10-22 18:44:57 +0200 |
|---|---|---|
| committer | Noe Rubinstein <nrubinstein@proformatique.com> | 2010-10-22 18:44:57 +0200 |
| commit | 1a2bfca2fe403a1185bfdcd5505d1a34fb05d4c6 (patch) | |
| tree | 0f9b6c60170be2cc456ba45ad73e66ef609db213 /xhfc | |
| parent | c3200ae30a899081220b1e9e1b06ddc3128b57c6 (diff) | |
remove xhfc_span_startup and shutdown
Diffstat (limited to 'xhfc')
| -rw-r--r-- | xhfc/xhfc.c | 28 | ||||
| -rw-r--r-- | xhfc/xhfc.h | 2 |
2 files changed, 2 insertions, 28 deletions
diff --git a/xhfc/xhfc.c b/xhfc/xhfc.c index b6d0bce..d0c938b 100644 --- a/xhfc/xhfc.c +++ b/xhfc/xhfc.c @@ -581,7 +581,7 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) for (i = 0; i < SPANS_PER_CHIP; i++) { struct xhfc_span* s = &xhfc->spans[i]; - if (s->running && s->sigchan) { + if ((s->flags & DAHDI_FLAG_RUNNING) && s->sigchan) { /* No need to loop here, no need to rx/tx * more than one HDLC frame per millisecond. */ hdlc_rx_frame(s); @@ -743,28 +743,6 @@ static void xhfc_span_set_ntte(struct xhfc_span* s, int ntte) s->span.spantype = ntte ? "NT" : "TE"; } -int xhfc_span_startup(struct dahdi_span* span) -{ - struct xhfc_span *xhfc_span = container_of(span, struct xhfc_span, span); - struct xhfc *x = xhfc_span->xhfc; - - if (!x->running) - enable_interrupts(x); - - set_mb(xhfc_span->running, 1); - - return 0; -} - -int xhfc_span_shutdown(struct dahdi_span* span) -{ - struct xhfc_span *xhfc_span = container_of(span, struct xhfc_span, span); - set_mb(xhfc_span->running, 0); - /* XXX should not this be synchronous? */ - return 0; -} - -/* should configure the S/T interfaces, in hardware then software */ int xhfc_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) { struct xhfc_span *xhfc_span; @@ -874,8 +852,6 @@ static const struct dahdi_span_ops xhfc_span_ops = { .owner = THIS_MODULE, .spanconfig = xhfc_spanconfig, .chanconfig = xhfc_chanconfig, - .startup = xhfc_span_startup, - .shutdown = xhfc_span_shutdown, .ioctl = xhfc_ioctl, .hdlc_hard_xmit = xhfc_hdlc_hard_xmit, }; @@ -1112,7 +1088,7 @@ int __devinit xhfc_init_one(struct pci_dev *pdev, goto err_in_dahdi_register; } - enable_interrupts(&pi->xhfc); /* enabled in startup <== XXX gnnnnn??? BUGBUG? */ + enable_interrupts(&pi->xhfc); #ifdef AUDIO xivo_tdm_start_chans(pi->tdm_port, diff --git a/xhfc/xhfc.h b/xhfc/xhfc.h index 1726975..801c81b 100644 --- a/xhfc/xhfc.h +++ b/xhfc/xhfc.h @@ -115,8 +115,6 @@ struct xhfc_span { int port; /* (physical) S/T port number */ int nt; /* 1 if the port is nt, 0 if it's TE */ - int running; - /* Got the following from DAHDI */ int oldstate; int newalarm; |