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
/
hfc_2bds0.c
diff --git
a/drivers/isdn/hisax/hfc_2bds0.c
b/drivers/isdn/hisax/hfc_2bds0.c
index
637a261
..
8d98644
100644
(file)
--- a/
drivers/isdn/hisax/hfc_2bds0.c
+++ b/
drivers/isdn/hisax/hfc_2bds0.c
@@
-549,10
+549,11
@@
setstack_2b(struct PStack *st, struct BCState *bcs)
}
static void
}
static void
-hfcd_bh(struct
IsdnCardState *cs
)
+hfcd_bh(struct
work_struct *work
)
{
{
- if (!cs)
- return;
+ struct IsdnCardState *cs =
+ container_of(work, struct IsdnCardState, tqueue);
+
if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) {
switch (cs->dc.hfcd.ph_state) {
case (0):
if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) {
switch (cs->dc.hfcd.ph_state) {
case (0):
@@
-1015,7
+1016,7
@@
hfc_dbusy_timer(struct IsdnCardState *cs)
{
}
{
}
-static unsigned int
__init
+static unsigned int
*init_send_hfcd(int cnt)
{
int i, *send;
*init_send_hfcd(int cnt)
{
int i, *send;
@@
-1030,7
+1031,7
@@
static unsigned int __init
return(send);
}
return(send);
}
-void
__init
+void
init2bds0(struct IsdnCardState *cs)
{
cs->setstack_d = setstack_hfcd;
init2bds0(struct IsdnCardState *cs)
{
cs->setstack_d = setstack_hfcd;
@@
-1072,5
+1073,5
@@
set_cs_func(struct IsdnCardState *cs)
cs->dbusytimer.function = (void *) hfc_dbusy_timer;
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
cs->dbusytimer.function = (void *) hfc_dbusy_timer;
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
- INIT_WORK(&cs->tqueue,
(void *)(void *) hfcd_bh, cs
);
+ INIT_WORK(&cs->tqueue,
hfcd_bh
);
}
}