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
/
amd7930_fn.c
diff --git
a/drivers/isdn/hisax/amd7930_fn.c
b/drivers/isdn/hisax/amd7930_fn.c
index
8ae08c4
..
3b19cae
100644
(file)
--- a/
drivers/isdn/hisax/amd7930_fn.c
+++ b/
drivers/isdn/hisax/amd7930_fn.c
@@
-232,9
+232,10
@@
Amd7930_new_ph(struct IsdnCardState *cs)
static void
static void
-Amd7930_bh(struct
IsdnCardState *cs
)
+Amd7930_bh(struct
work_struct *work
)
{
{
-
+ struct IsdnCardState *cs =
+ container_of(work, struct IsdnCardState, tqueue);
struct PStack *stptr;
if (!cs)
struct PStack *stptr;
if (!cs)
@@
-733,7
+734,7
@@
dbusy_timer_handler(struct IsdnCardState *cs)
wByteAMD(cs, 0x21, 0x82);
wByteAMD(cs, 0x21, 0x02);
spin_unlock_irqrestore(&cs->lock, flags);
wByteAMD(cs, 0x21, 0x82);
wByteAMD(cs, 0x21, 0x02);
spin_unlock_irqrestore(&cs->lock, flags);
- cs->irq_func(cs->irq, cs
, NULL
);
+ cs->irq_func(cs->irq, cs);
if (cs->debug & L1_DEB_ISAC)
debugl1(cs, "Amd7930: dbusy_timer_handler: Transmitter reset");
if (cs->debug & L1_DEB_ISAC)
debugl1(cs, "Amd7930: dbusy_timer_handler: Transmitter reset");
@@
-789,7
+790,7
@@
Amd7930_init(struct IsdnCardState *cs)
void __devinit
setup_Amd7930(struct IsdnCardState *cs)
{
void __devinit
setup_Amd7930(struct IsdnCardState *cs)
{
- INIT_WORK(&cs->tqueue,
(void *)(void *) Amd7930_bh, cs
);
+ INIT_WORK(&cs->tqueue,
Amd7930_bh
);
cs->dbusytimer.function = (void *) dbusy_timer_handler;
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
cs->dbusytimer.function = (void *) dbusy_timer_handler;
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);