diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-10-26 19:00:28 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-10-26 19:00:28 +0000 |
| commit | 835a0a722df18f4db9ccf5daf7bd54266d14e4a7 (patch) | |
| tree | d657ae1054c91c3127088a14499582fad841c6af /drivers/dahdi/wcte11xp.c | |
| parent | 581df51b0dfcf3148dad593cb13705fd6896d5ed (diff) | |
dahdi: Remove dahdi_span.irq and move dahdi_span.irqmisses into dahdi_device.
'irqmisses' is more a function of the device and there are better ways
to get to IRQ for a device than storing it in any DAHDI structures.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10276 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wcte11xp.c')
| -rw-r--r-- | drivers/dahdi/wcte11xp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c index b2eab8d..05a9f95 100644 --- a/drivers/dahdi/wcte11xp.c +++ b/drivers/dahdi/wcte11xp.c @@ -994,7 +994,6 @@ static int t1xxp_software_init(struct t1 *wc) if (!wc->ddev->location) return -ENOMEM; - wc->span.irq = wc->dev->irq; if (wc->spantype == TYPE_E1) { if (unchannelized) wc->span.channels = 32; @@ -1129,10 +1128,10 @@ static void t1xxp_receiveprep(struct t1 *wc, int ints) if (((oldcan & 0xffff0000) >> 16) != CANARY) { /* Check top part */ if (debug) printk(KERN_DEBUG "Expecting top %04x, got %04x\n", CANARY, (oldcan & 0xffff0000) >> 16); - wc->span.irqmisses++; + wc->ddev->irqmisses++; } else if ((oldcan & 0xffff) != ((wc->canary - 1) & 0xffff)) { if (debug) printk(KERN_DEBUG "Expecting bottom %d, got %d\n", wc->canary - 1, oldcan & 0xffff); - wc->span.irqmisses++; + wc->ddev->irqmisses++; } for (y=0;y<DAHDI_CHUNKSIZE;y++) { for (x=0;x<wc->span.channels;x++) { |