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
/
isac.c
diff --git
a/drivers/isdn/hisax/isac.c
b/drivers/isdn/hisax/isac.c
index
565b789
..
4e9f238
100644
(file)
--- a/
drivers/isdn/hisax/isac.c
+++ b/
drivers/isdn/hisax/isac.c
@@
-81,8
+81,10
@@
isac_new_ph(struct IsdnCardState *cs)
}
static void
}
static void
-isac_bh(struct
IsdnCardState *cs
)
+isac_bh(struct
work_struct *work
)
{
{
+ struct IsdnCardState *cs =
+ container_of(work, struct IsdnCardState, tqueue);
struct PStack *stptr;
if (!cs)
struct PStack *stptr;
if (!cs)
@@
-609,7
+611,7
@@
dbusy_timer_handler(struct IsdnCardState *cs)
debugl1(cs, "D-Channel Busy no skb");
}
cs->writeisac(cs, ISAC_CMDR, 0x01); /* Transmitter reset */
debugl1(cs, "D-Channel Busy no skb");
}
cs->writeisac(cs, ISAC_CMDR, 0x01); /* Transmitter reset */
- cs->irq_func(cs->irq, cs
, NULL
);
+ cs->irq_func(cs->irq, cs);
}
}
}
}
}
}
@@
-674,7
+676,7
@@
clear_pending_isac_ints(struct IsdnCardState *cs)
void __devinit
setup_isac(struct IsdnCardState *cs)
{
void __devinit
setup_isac(struct IsdnCardState *cs)
{
- INIT_WORK(&cs->tqueue,
(void *)(void *) isac_bh, cs
);
+ INIT_WORK(&cs->tqueue,
isac_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);