git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
w6692.c
diff --git
a/drivers/isdn/hisax/w6692.c
b/drivers/isdn/hisax/w6692.c
index
0595293
..
3aeceaf
100644
(file)
--- a/
drivers/isdn/hisax/w6692.c
+++ b/
drivers/isdn/hisax/w6692.c
@@
-101,8
+101,10
@@
W6692_new_ph(struct IsdnCardState *cs)
}
static void
}
static void
-W6692_bh(struct
IsdnCardState *cs
)
+W6692_bh(struct
work_struct *work
)
{
{
+ struct IsdnCardState *cs =
+ container_of(work, struct IsdnCardState, tqueue);
struct PStack *stptr;
if (!cs)
struct PStack *stptr;
if (!cs)
@@
-400,7
+402,7
@@
W6692B_interrupt(struct IsdnCardState *cs, u_char bchan)
}
static irqreturn_t
}
static irqreturn_t
-W6692_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+W6692_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, exval, v1;
{
struct IsdnCardState *cs = dev_id;
u_char val, exval, v1;
@@
-715,7
+717,7
@@
dbusy_timer_handler(struct IsdnCardState *cs)
}
cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_XRST); /* Transmitter reset */
spin_unlock_irqrestore(&cs->lock, flags);
}
cs->writeW6692(cs, W_D_CMDR, W_D_CMDR_XRST); /* Transmitter reset */
spin_unlock_irqrestore(&cs->lock, flags);
- cs->irq_func(cs->irq, cs
, NULL
);
+ cs->irq_func(cs->irq, cs);
return;
}
}
return;
}
}
@@
-1070,7
+1072,7
@@
setup_w6692(struct IsdnCard *card)
id_list[cs->subtyp].card_name, cs->irq,
cs->hw.w6692.iobase);
id_list[cs->subtyp].card_name, cs->irq,
cs->hw.w6692.iobase);
- INIT_WORK(&cs->tqueue,
(void *)(void *) W6692_bh, cs
);
+ INIT_WORK(&cs->tqueue,
W6692_bh
);
cs->readW6692 = &ReadW6692;
cs->writeW6692 = &WriteW6692;
cs->readisacfifo = &ReadISACfifo;
cs->readW6692 = &ReadW6692;
cs->writeW6692 = &WriteW6692;
cs->readisacfifo = &ReadISACfifo;