diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-03-03 12:42:31 -0600 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-04-15 14:21:14 -0500 |
| commit | f900e1f229bbd4e04229052b18a1dc6cacbb0e52 (patch) | |
| tree | 88000a1a498af9c4b15324a7275f50a46bf2e667 /drivers/dahdi/wcte12xp | |
| parent | 3080253725eb7a1ba1cec08735c1476a3fd3c1c7 (diff) | |
dahdi: Move irq/irqmisses from dahdi_span into dahdi_device.
These fields do not have anything to do with the span.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Diffstat (limited to 'drivers/dahdi/wcte12xp')
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 037fc9d..67100dc 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1571,8 +1571,6 @@ static int t1_software_init(struct t1 *wc) if (!wc->ddev->location) return -ENOMEM; - wc->span.irq = pdev->irq; - if (wc->spantype == TYPE_E1) { wc->span.channels = 31; wc->span.spantype = "E1"; @@ -1991,7 +1989,7 @@ static inline void t1_receiveprep(struct t1 *wc, const u8* sframe) wc->rxident = eframe[EFRAME_SIZE + 1]; wc->statreg = eframe[EFRAME_SIZE + 2]; if (wc->rxident != expected) { - wc->span.irqmisses++; + wc->ddev->irqmisses++; _resend_cmds(wc); if (unlikely(debug)) { t1_info(wc, "oops: rxident=%d " @@ -2285,6 +2283,7 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi INIT_LIST_HEAD(&wc->active_cmds); INIT_LIST_HEAD(&wc->pending_cmds); + wc->ddev->irq = pdev->irq; wc->variety = d->name; wc->txident = 1; |