diff options
author | Guillaume Knispel <gknispel@proformatique.com> | 2012-01-17 17:10:57 +0100 |
---|---|---|
committer | Guillaume Knispel <gknispel@proformatique.com> | 2012-01-17 17:10:57 +0100 |
commit | ff49480735bcc87231c4047de44cfa83d73ffa37 (patch) | |
tree | 07e4cee533d4a79bfd6b4fff3700fc22ac69bb11 /xhfc/base.c | |
parent | 2c6311723ab52b6f6010c7fd64e4335ced5d3aef (diff) |
port to 2.6.32 (work in progress)
Diffstat (limited to 'xhfc/base.c')
-rw-r--r-- | xhfc/base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xhfc/base.c b/xhfc/base.c index 0b70dbc..0326b68 100644 --- a/xhfc/base.c +++ b/xhfc/base.c @@ -583,7 +583,7 @@ void xhfc_hdlc_hard_xmit(struct dahdi_chan *chan) #define fifo_test(reg, fifonum, dir) \ (reg[fifonum/4] & (1 << (((fifonum % 4) * 2) + dir))) -irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) +irqreturn_t xhfc_interrupt(int irq, void *dev_id) { struct xhfc_pi *pi = dev_id; @@ -595,8 +595,6 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) u8 fifo_irq[SPANS_PER_CHIP]; u8 fifo_fill[SPANS_PER_CHIP]; - (void) ptregs; - xhfc = &pi->xhfc; /* IRQs for other HW with shared IRQ or spurious @@ -652,7 +650,7 @@ irqreturn_t xhfc_interrupt(int irq, void *dev_id, struct pt_regs* ptregs) } static int dbg_rxtx; -module_param(dbg_rxtx, int, 0666); +module_param(dbg_rxtx, int, 0664); MODULE_PARM_DESC(dbg_rxtx, "number of calls to xhfc_rxtx to trace"); #ifdef AUDIO |