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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
hfc_sx.c
diff --git
a/drivers/isdn/hisax/hfc_sx.c
b/drivers/isdn/hisax/hfc_sx.c
index
f27c160
..
4fd09d2
100644
(file)
--- a/
drivers/isdn/hisax/hfc_sx.c
+++ b/
drivers/isdn/hisax/hfc_sx.c
@@
-691,7
+691,7
@@
receive_emsg(struct IsdnCardState *cs)
/* Interrupt handler */
/*********************/
static irqreturn_t
/* Interrupt handler */
/*********************/
static irqreturn_t
-hfcsx_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+hfcsx_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char exval;
{
struct IsdnCardState *cs = dev_id;
u_char exval;
@@
-970,7
+970,7
@@
HFCSX_l1hw(struct PStack *st, int pr, void *arg)
break;
case (HW_TESTLOOP | REQUEST):
spin_lock_irqsave(&cs->lock, flags);
break;
case (HW_TESTLOOP | REQUEST):
spin_lock_irqsave(&cs->lock, flags);
- switch ((
int
) arg) {
+ switch ((
long
) arg) {
case (1):
Write_hfc(cs, HFCSX_B1_SSL, 0x80); /* tx slot */
Write_hfc(cs, HFCSX_B1_RSL, 0x80); /* rx slot */
case (1):
Write_hfc(cs, HFCSX_B1_SSL, 0x80); /* tx slot */
Write_hfc(cs, HFCSX_B1_RSL, 0x80); /* rx slot */
@@
-986,7
+986,7
@@
HFCSX_l1hw(struct PStack *st, int pr, void *arg)
default:
spin_unlock_irqrestore(&cs->lock, flags);
if (cs->debug & L1_DEB_WARN)
default:
spin_unlock_irqrestore(&cs->lock, flags);
if (cs->debug & L1_DEB_WARN)
- debugl1(cs, "hfcsx_l1hw loop invalid %4
x", (int)
arg);
+ debugl1(cs, "hfcsx_l1hw loop invalid %4
lx",
arg);
return;
}
cs->hw.hfcsx.trm |= 0x80; /* enable IOM-loop */
return;
}
cs->hw.hfcsx.trm |= 0x80; /* enable IOM-loop */
@@
-1251,8
+1251,10
@@
setstack_2b(struct PStack *st, struct BCState *bcs)
/* handle L1 state changes */
/***************************/
static void
/* handle L1 state changes */
/***************************/
static void
-hfcsx_bh(struct
IsdnCardState *cs
)
+hfcsx_bh(struct
work_struct *work
)
{
{
+ struct IsdnCardState *cs =
+ container_of(work, struct IsdnCardState, tqueue);
u_long flags;
if (!cs)
u_long flags;
if (!cs)
@@
-1499,7
+1501,7
@@
setup_hfcsx(struct IsdnCard *card)
cs->dbusytimer.function = (void *) hfcsx_dbusy_timer;
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
cs->dbusytimer.function = (void *) hfcsx_dbusy_timer;
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
- INIT_WORK(&cs->tqueue,
(void *)(void *) hfcsx_bh, cs
);
+ INIT_WORK(&cs->tqueue,
hfcsx_bh
);
cs->readisac = NULL;
cs->writeisac = NULL;
cs->readisacfifo = NULL;
cs->readisac = NULL;
cs->writeisac = NULL;
cs->readisacfifo = NULL;