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/dahdi-base.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/dahdi-base.c')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 6886195..041645c 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -845,8 +845,8 @@ static int dahdi_seq_show(struct seq_file *sfile, void *v) seq_printf(sfile, "\tE-bit error count: %d\n", s->count.ebit); if (s->count.fas) seq_printf(sfile, "\tFAS error count: %d\n", s->count.fas); - if (s->irqmisses) - seq_printf(sfile, "\tIRQ misses: %d\n", s->irqmisses); + if (s->parent->irqmisses) + seq_printf(sfile, "\tIRQ misses: %d\n", s->parent->irqmisses); if (s->timingslips) seq_printf(sfile, "\tTiming slips: %d\n", s->timingslips); seq_printf(sfile, "\n"); @@ -4246,7 +4246,7 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data) spaninfo.prbs = s->count.prbs; spaninfo.errsec = s->count.errsec; - spaninfo.irqmisses = s->irqmisses; /* get IRQ miss count */ + spaninfo.irqmisses = s->parent->irqmisses; /* get IRQ miss count */ spaninfo.syncsrc = s->syncsrc; /* get active sync source */ spaninfo.totalchans = s->channels; spaninfo.numchans = 0; @@ -4256,7 +4256,7 @@ static int dahdi_ioctl_spanstat(struct file *file, unsigned long data) } spaninfo.lbo = s->lbo; spaninfo.lineconfig = s->lineconfig; - spaninfo.irq = s->irq; + spaninfo.irq = 0; spaninfo.linecompat = s->linecompat; strlcpy(spaninfo.lboname, dahdi_lboname(s->lbo), sizeof(spaninfo.lboname)); @@ -4333,7 +4333,7 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data) spaninfo_v1.crc4count = s->count.crc4; spaninfo_v1.ebitcount = s->count.ebit; spaninfo_v1.fascount = s->count.fas; - spaninfo_v1.irqmisses = s->irqmisses; + spaninfo_v1.irqmisses = s->parent->irqmisses; spaninfo_v1.syncsrc = s->syncsrc; spaninfo_v1.totalchans = s->channels; spaninfo_v1.numchans = 0; @@ -4343,7 +4343,7 @@ static int dahdi_ioctl_spanstat_v1(struct file *file, unsigned long data) } spaninfo_v1.lbo = s->lbo; spaninfo_v1.lineconfig = s->lineconfig; - spaninfo_v1.irq = s->irq; + spaninfo_v1.irq = 0; spaninfo_v1.linecompat = s->linecompat; strlcpy(spaninfo_v1.lboname, dahdi_lboname(s->lbo), |