isdn: use setup_timer

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geliang Tang 2017-03-23 21:15:57 +08:00 committed by David S. Miller
parent 9096643856
commit aff55a3638
30 changed files with 54 additions and 114 deletions

View File

@ -157,10 +157,8 @@ int cf_command(int drvid, int mode,
/* allocate mem for information struct */ /* allocate mem for information struct */
if (!(cs = kmalloc(sizeof(struct call_struc), GFP_ATOMIC))) if (!(cs = kmalloc(sizeof(struct call_struc), GFP_ATOMIC)))
return (-ENOMEM); /* no memory */ return (-ENOMEM); /* no memory */
init_timer(&cs->timer); setup_timer(&cs->timer, deflect_timer_expire, (ulong)cs);
cs->info[0] = '\0'; cs->info[0] = '\0';
cs->timer.function = deflect_timer_expire;
cs->timer.data = (ulong) cs; /* pointer to own structure */
cs->ics.driver = drvid; cs->ics.driver = drvid;
cs->ics.command = ISDN_CMD_PROT_IO; /* protocol specific io */ cs->ics.command = ISDN_CMD_PROT_IO; /* protocol specific io */
cs->ics.arg = DSS1_CMD_INVOKE; /* invoke supplementary service */ cs->ics.arg = DSS1_CMD_INVOKE; /* invoke supplementary service */
@ -452,10 +450,9 @@ static int isdn_divert_icall(isdn_ctrl *ic)
return (0); /* no external deflection needed */ return (0); /* no external deflection needed */
if (!(cs = kmalloc(sizeof(struct call_struc), GFP_ATOMIC))) if (!(cs = kmalloc(sizeof(struct call_struc), GFP_ATOMIC)))
return (0); /* no memory */ return (0); /* no memory */
init_timer(&cs->timer); setup_timer(&cs->timer, deflect_timer_expire,
(ulong)cs);
cs->info[0] = '\0'; cs->info[0] = '\0';
cs->timer.function = deflect_timer_expire;
cs->timer.data = (ulong) cs; /* pointer to own structure */
cs->ics = *ic; /* copy incoming data */ cs->ics = *ic; /* copy incoming data */
if (!cs->ics.parm.setup.phone[0]) strcpy(cs->ics.parm.setup.phone, "0"); if (!cs->ics.parm.setup.phone[0]) strcpy(cs->ics.parm.setup.phone, "0");

View File

@ -300,9 +300,8 @@ static int um_idi_open_adapter(struct file *file, int adapter_nr)
p_os = (diva_um_idi_os_context_t *) diva_um_id_get_os_context(e); p_os = (diva_um_idi_os_context_t *) diva_um_id_get_os_context(e);
init_waitqueue_head(&p_os->read_wait); init_waitqueue_head(&p_os->read_wait);
init_waitqueue_head(&p_os->close_wait); init_waitqueue_head(&p_os->close_wait);
init_timer(&p_os->diva_timer_id); setup_timer(&p_os->diva_timer_id, (void *)diva_um_timer_function,
p_os->diva_timer_id.function = (void *) diva_um_timer_function; (unsigned long)p_os);
p_os->diva_timer_id.data = (unsigned long) p_os;
p_os->aborted = 0; p_os->aborted = 0;
p_os->adapter_nr = adapter_nr; p_os->adapter_nr = adapter_nr;
return (1); return (1);

View File

@ -3878,9 +3878,8 @@ hfcmulti_initmode(struct dchannel *dch)
if (hc->dnum[pt]) { if (hc->dnum[pt]) {
mode_hfcmulti(hc, dch->slot, dch->dev.D.protocol, mode_hfcmulti(hc, dch->slot, dch->dev.D.protocol,
-1, 0, -1, 0); -1, 0, -1, 0);
dch->timer.function = (void *) hfcmulti_dbusy_timer; setup_timer(&dch->timer, (void *)hfcmulti_dbusy_timer,
dch->timer.data = (long) dch; (long)dch);
init_timer(&dch->timer);
} }
for (i = 1; i <= 31; i++) { for (i = 1; i <= 31; i++) {
if (!((1 << i) & hc->bmask[pt])) /* skip unused chan */ if (!((1 << i) & hc->bmask[pt])) /* skip unused chan */
@ -3986,9 +3985,8 @@ hfcmulti_initmode(struct dchannel *dch)
hc->chan[i].slot_rx = -1; hc->chan[i].slot_rx = -1;
hc->chan[i].conf = -1; hc->chan[i].conf = -1;
mode_hfcmulti(hc, i, dch->dev.D.protocol, -1, 0, -1, 0); mode_hfcmulti(hc, i, dch->dev.D.protocol, -1, 0, -1, 0);
dch->timer.function = (void *) hfcmulti_dbusy_timer; setup_timer(&dch->timer, (void *)hfcmulti_dbusy_timer,
dch->timer.data = (long) dch; (long)dch);
init_timer(&dch->timer);
hc->chan[i - 2].slot_tx = -1; hc->chan[i - 2].slot_tx = -1;
hc->chan[i - 2].slot_rx = -1; hc->chan[i - 2].slot_rx = -1;
hc->chan[i - 2].conf = -1; hc->chan[i - 2].conf = -1;

View File

@ -1717,9 +1717,8 @@ static void
inithfcpci(struct hfc_pci *hc) inithfcpci(struct hfc_pci *hc)
{ {
printk(KERN_DEBUG "inithfcpci: entered\n"); printk(KERN_DEBUG "inithfcpci: entered\n");
hc->dch.timer.function = (void *) hfcpci_dbusy_timer; setup_timer(&hc->dch.timer, (void *)hfcpci_dbusy_timer,
hc->dch.timer.data = (long) &hc->dch; (long)&hc->dch);
init_timer(&hc->dch.timer);
hc->chanlimit = 2; hc->chanlimit = 2;
mode_hfcpci(&hc->bch[0], 1, -1); mode_hfcpci(&hc->bch[0], 1, -1);
mode_hfcpci(&hc->bch[1], 2, -1); mode_hfcpci(&hc->bch[1], 2, -1);
@ -2044,9 +2043,7 @@ setup_hw(struct hfc_pci *hc)
Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1); Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
/* At this point the needed PCI config is done */ /* At this point the needed PCI config is done */
/* fifos are still not enabled */ /* fifos are still not enabled */
hc->hw.timer.function = (void *) hfcpci_Timer; setup_timer(&hc->hw.timer, (void *)hfcpci_Timer, (long)hc);
hc->hw.timer.data = (long) hc;
init_timer(&hc->hw.timer);
/* default PCM master */ /* default PCM master */
test_and_set_bit(HFC_CFG_MASTER, &hc->cfg); test_and_set_bit(HFC_CFG_MASTER, &hc->cfg);
return 0; return 0;

View File

@ -796,9 +796,8 @@ isac_init(struct isac_hw *isac)
} }
isac->mon_tx = NULL; isac->mon_tx = NULL;
isac->mon_rx = NULL; isac->mon_rx = NULL;
isac->dch.timer.function = (void *) dbusy_timer_handler; setup_timer(&isac->dch.timer, (void *)dbusy_timer_handler,
isac->dch.timer.data = (long)isac; (long)isac);
init_timer(&isac->dch.timer);
isac->mocr = 0xaa; isac->mocr = 0xaa;
if (isac->type & IPAC_TYPE_ISACX) { if (isac->type & IPAC_TYPE_ISACX) {
/* Disable all IRQ */ /* Disable all IRQ */

View File

@ -1635,13 +1635,11 @@ init_isar(struct isar_hw *isar)
} }
if (isar->version != 1) if (isar->version != 1)
return -EINVAL; return -EINVAL;
isar->ch[0].ftimer.function = &ftimer_handler; setup_timer(&isar->ch[0].ftimer, &ftimer_handler,
isar->ch[0].ftimer.data = (long)&isar->ch[0]; (long)&isar->ch[0]);
init_timer(&isar->ch[0].ftimer);
test_and_set_bit(FLG_INITIALIZED, &isar->ch[0].bch.Flags); test_and_set_bit(FLG_INITIALIZED, &isar->ch[0].bch.Flags);
isar->ch[1].ftimer.function = &ftimer_handler; setup_timer(&isar->ch[1].ftimer, &ftimer_handler,
isar->ch[1].ftimer.data = (long)&isar->ch[1]; (long)&isar->ch[1]);
init_timer(&isar->ch[1].ftimer);
test_and_set_bit(FLG_INITIALIZED, &isar->ch[1].bch.Flags); test_and_set_bit(FLG_INITIALIZED, &isar->ch[1].bch.Flags);
return 0; return 0;
} }

View File

@ -852,9 +852,8 @@ static void initW6692(struct w6692_hw *card)
{ {
u8 val; u8 val;
card->dch.timer.function = (void *)dbusy_timer_handler; setup_timer(&card->dch.timer, (void *)dbusy_timer_handler,
card->dch.timer.data = (u_long)&card->dch; (u_long)&card->dch);
init_timer(&card->dch.timer);
w6692_mode(&card->bc[0], ISDN_P_NONE); w6692_mode(&card->bc[0], ISDN_P_NONE);
w6692_mode(&card->bc[1], ISDN_P_NONE); w6692_mode(&card->bc[1], ISDN_P_NONE);
WriteW6692(card, W_D_CTL, 0x00); WriteW6692(card, W_D_CTL, 0x00);

View File

@ -789,7 +789,5 @@ void Amd7930_init(struct IsdnCardState *cs)
void setup_Amd7930(struct IsdnCardState *cs) void setup_Amd7930(struct IsdnCardState *cs)
{ {
INIT_WORK(&cs->tqueue, Amd7930_bh); INIT_WORK(&cs->tqueue, Amd7930_bh);
cs->dbusytimer.function = (void *) dbusy_timer_handler; setup_timer(&cs->dbusytimer, (void *)dbusy_timer_handler, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
} }

View File

@ -125,9 +125,7 @@ clear_arcofi(struct IsdnCardState *cs) {
void void
init_arcofi(struct IsdnCardState *cs) { init_arcofi(struct IsdnCardState *cs) {
cs->dc.isac.arcofitimer.function = (void *) arcofi_timer; setup_timer(&cs->dc.isac.arcofitimer, (void *)arcofi_timer, (long)cs);
cs->dc.isac.arcofitimer.data = (long) cs;
init_timer(&cs->dc.isac.arcofitimer);
init_waitqueue_head(&cs->dc.isac.arcofi_wait); init_waitqueue_head(&cs->dc.isac.arcofi_wait);
test_and_set_bit(HW_ARCOFI, &cs->HW_Flags); test_and_set_bit(HW_ARCOFI, &cs->HW_Flags);
} }

View File

@ -976,9 +976,8 @@ static int setup_diva_common(struct IsdnCardState *cs)
printk(KERN_INFO "Diva: IPACX Design Id: %x\n", printk(KERN_INFO "Diva: IPACX Design Id: %x\n",
MemReadISAC_IPACX(cs, IPACX_ID) & 0x3F); MemReadISAC_IPACX(cs, IPACX_ID) & 0x3F);
} else { /* DIVA 2.0 */ } else { /* DIVA 2.0 */
cs->hw.diva.tl.function = (void *) diva_led_handler; setup_timer(&cs->hw.diva.tl, (void *)diva_led_handler,
cs->hw.diva.tl.data = (long) cs; (long)cs);
init_timer(&cs->hw.diva.tl);
cs->readisac = &ReadISAC; cs->readisac = &ReadISAC;
cs->writeisac = &WriteISAC; cs->writeisac = &WriteISAC;
cs->readisacfifo = &ReadISACfifo; cs->readisacfifo = &ReadISACfifo;

View File

@ -1147,9 +1147,7 @@ static int setup_elsa_common(struct IsdnCard *card)
init_arcofi(cs); init_arcofi(cs);
#endif #endif
setup_isac(cs); setup_isac(cs);
cs->hw.elsa.tl.function = (void *) elsa_led_handler; setup_timer(&cs->hw.elsa.tl, (void *)elsa_led_handler, (long)cs);
cs->hw.elsa.tl.data = (long) cs;
init_timer(&cs->hw.elsa.tl);
/* Teste Timer */ /* Teste Timer */
if (cs->hw.elsa.timer) { if (cs->hw.elsa.timer) {
byteout(cs->hw.elsa.trig, 0xff); byteout(cs->hw.elsa.trig, 0xff);

View File

@ -98,13 +98,11 @@ void
FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft) FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft)
{ {
ft->fi = fi; ft->fi = fi;
ft->tl.function = (void *) FsmExpireTimer;
ft->tl.data = (long) ft;
#if FSM_TIMER_DEBUG #if FSM_TIMER_DEBUG
if (ft->fi->debug) if (ft->fi->debug)
ft->fi->printdebug(ft->fi, "FsmInitTimer %lx", (long) ft); ft->fi->printdebug(ft->fi, "FsmInitTimer %lx", (long) ft);
#endif #endif
init_timer(&ft->tl); setup_timer(&ft->tl, (void *)FsmExpireTimer, (long)ft);
} }
void void

View File

@ -1396,9 +1396,8 @@ setup_instance(hfc4s8s_hw *hw)
l1p = hw->l1 + i; l1p = hw->l1 + i;
spin_lock_init(&l1p->lock); spin_lock_init(&l1p->lock);
l1p->hw = hw; l1p->hw = hw;
l1p->l1_timer.function = (void *) hfc_l1_timer; setup_timer(&l1p->l1_timer, (void *)hfc_l1_timer,
l1p->l1_timer.data = (long) (l1p); (long)(l1p));
init_timer(&l1p->l1_timer);
l1p->st_num = i; l1p->st_num = i;
skb_queue_head_init(&l1p->d_tx_queue); skb_queue_head_init(&l1p->d_tx_queue);
l1p->d_if.ifc.priv = hw->l1 + i; l1p->d_if.ifc.priv = hw->l1 + i;

View File

@ -1073,8 +1073,6 @@ set_cs_func(struct IsdnCardState *cs)
cs->writeisacfifo = &dummyf; cs->writeisacfifo = &dummyf;
cs->BC_Read_Reg = &ReadReg; cs->BC_Read_Reg = &ReadReg;
cs->BC_Write_Reg = &WriteReg; cs->BC_Write_Reg = &WriteReg;
cs->dbusytimer.function = (void *) hfc_dbusy_timer; setup_timer(&cs->dbusytimer, (void *)hfc_dbusy_timer, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
INIT_WORK(&cs->tqueue, hfcd_bh); INIT_WORK(&cs->tqueue, hfcd_bh);
} }

View File

@ -1582,9 +1582,7 @@ inithfcpci(struct IsdnCardState *cs)
cs->bcs[1].BC_SetStack = setstack_2b; cs->bcs[1].BC_SetStack = setstack_2b;
cs->bcs[0].BC_Close = close_hfcpci; cs->bcs[0].BC_Close = close_hfcpci;
cs->bcs[1].BC_Close = close_hfcpci; cs->bcs[1].BC_Close = close_hfcpci;
cs->dbusytimer.function = (void *) hfcpci_dbusy_timer; setup_timer(&cs->dbusytimer, (void *)hfcpci_dbusy_timer, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
mode_hfcpci(cs->bcs, 0, 0); mode_hfcpci(cs->bcs, 0, 0);
mode_hfcpci(cs->bcs + 1, 0, 1); mode_hfcpci(cs->bcs + 1, 0, 1);
} }
@ -1746,9 +1744,7 @@ setup_hfcpci(struct IsdnCard *card)
cs->BC_Write_Reg = NULL; cs->BC_Write_Reg = NULL;
cs->irq_func = &hfcpci_interrupt; cs->irq_func = &hfcpci_interrupt;
cs->irq_flags |= IRQF_SHARED; cs->irq_flags |= IRQF_SHARED;
cs->hw.hfcpci.timer.function = (void *) hfcpci_Timer; setup_timer(&cs->hw.hfcpci.timer, (void *)hfcpci_Timer, (long)cs);
cs->hw.hfcpci.timer.data = (long) cs;
init_timer(&cs->hw.hfcpci.timer);
cs->cardmsg = &hfcpci_card_msg; cs->cardmsg = &hfcpci_card_msg;
cs->auxcmd = &hfcpci_auxcmd; cs->auxcmd = &hfcpci_auxcmd;

View File

@ -1495,9 +1495,7 @@ int setup_hfcsx(struct IsdnCard *card)
} else } else
return (0); /* no valid card type */ return (0); /* no valid card type */
cs->dbusytimer.function = (void *) hfcsx_dbusy_timer; setup_timer(&cs->dbusytimer, (void *)hfcsx_dbusy_timer, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
INIT_WORK(&cs->tqueue, hfcsx_bh); INIT_WORK(&cs->tqueue, hfcsx_bh);
cs->readisac = NULL; cs->readisac = NULL;
cs->writeisac = NULL; cs->writeisac = NULL;
@ -1507,11 +1505,9 @@ int setup_hfcsx(struct IsdnCard *card)
cs->BC_Write_Reg = NULL; cs->BC_Write_Reg = NULL;
cs->irq_func = &hfcsx_interrupt; cs->irq_func = &hfcsx_interrupt;
cs->hw.hfcsx.timer.function = (void *) hfcsx_Timer;
cs->hw.hfcsx.timer.data = (long) cs;
cs->hw.hfcsx.b_fifo_size = 0; /* fifo size still unknown */ cs->hw.hfcsx.b_fifo_size = 0; /* fifo size still unknown */
cs->hw.hfcsx.cirm = ccd_sp_irqtab[cs->irq & 0xF]; /* RAM not evaluated */ cs->hw.hfcsx.cirm = ccd_sp_irqtab[cs->irq & 0xF]; /* RAM not evaluated */
init_timer(&cs->hw.hfcsx.timer); setup_timer(&cs->hw.hfcsx.timer, (void *)hfcsx_Timer, (long)cs);
reset_hfcsx(cs); reset_hfcsx(cs);
cs->cardmsg = &hfcsx_card_msg; cs->cardmsg = &hfcsx_card_msg;

View File

@ -1165,14 +1165,10 @@ hfc_usb_init(hfcusb_data *hfc)
hfc->old_led_state = 0; hfc->old_led_state = 0;
/* init the t3 timer */ /* init the t3 timer */
init_timer(&hfc->t3_timer); setup_timer(&hfc->t3_timer, (void *)l1_timer_expire_t3, (long)hfc);
hfc->t3_timer.data = (long) hfc;
hfc->t3_timer.function = (void *) l1_timer_expire_t3;
/* init the t4 timer */ /* init the t4 timer */
init_timer(&hfc->t4_timer); setup_timer(&hfc->t4_timer, (void *)l1_timer_expire_t4, (long)hfc);
hfc->t4_timer.data = (long) hfc;
hfc->t4_timer.function = (void *) l1_timer_expire_t4;
/* init the background machinery for control requests */ /* init the background machinery for control requests */
hfc->ctrl_read.bRequestType = 0xc0; hfc->ctrl_read.bRequestType = 0xc0;

View File

@ -253,9 +253,7 @@ int setup_hfcs(struct IsdnCard *card)
outb(0x57, cs->hw.hfcD.addr | 1); outb(0x57, cs->hw.hfcD.addr | 1);
} }
set_cs_func(cs); set_cs_func(cs);
cs->hw.hfcD.timer.function = (void *) hfcs_Timer; setup_timer(&cs->hw.hfcD.timer, (void *)hfcs_Timer, (long)cs);
cs->hw.hfcD.timer.data = (long) cs;
init_timer(&cs->hw.hfcD.timer);
cs->cardmsg = &hfcs_card_msg; cs->cardmsg = &hfcs_card_msg;
cs->irq_func = &hfcs_interrupt; cs->irq_func = &hfcs_interrupt;
return (1); return (1);

View File

@ -676,7 +676,5 @@ clear_pending_icc_ints(struct IsdnCardState *cs)
void setup_icc(struct IsdnCardState *cs) void setup_icc(struct IsdnCardState *cs)
{ {
INIT_WORK(&cs->tqueue, icc_bh); INIT_WORK(&cs->tqueue, icc_bh);
cs->dbusytimer.function = (void *) dbusy_timer_handler; setup_timer(&cs->dbusytimer, (void *)dbusy_timer_handler, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
} }

View File

@ -424,9 +424,7 @@ dch_init(struct IsdnCardState *cs)
cs->setstack_d = dch_setstack; cs->setstack_d = dch_setstack;
cs->dbusytimer.function = (void *) dbusy_timer_handler; setup_timer(&cs->dbusytimer, (void *)dbusy_timer_handler, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
cs->writeisac(cs, IPACX_TR_CONF0, 0x00); // clear LDD cs->writeisac(cs, IPACX_TR_CONF0, 0x00); // clear LDD
cs->writeisac(cs, IPACX_TR_CONF2, 0x00); // enable transmitter cs->writeisac(cs, IPACX_TR_CONF2, 0x00); // enable transmitter

View File

@ -677,7 +677,5 @@ void clear_pending_isac_ints(struct IsdnCardState *cs)
void setup_isac(struct IsdnCardState *cs) void setup_isac(struct IsdnCardState *cs)
{ {
INIT_WORK(&cs->tqueue, isac_bh); INIT_WORK(&cs->tqueue, isac_bh);
cs->dbusytimer.function = (void *) dbusy_timer_handler; setup_timer(&cs->dbusytimer, (void *)dbusy_timer_handler, (long)cs);
cs->dbusytimer.data = (long) cs;
init_timer(&cs->dbusytimer);
} }

View File

@ -1902,10 +1902,8 @@ void initisar(struct IsdnCardState *cs)
cs->bcs[1].BC_SetStack = setstack_isar; cs->bcs[1].BC_SetStack = setstack_isar;
cs->bcs[0].BC_Close = close_isarstate; cs->bcs[0].BC_Close = close_isarstate;
cs->bcs[1].BC_Close = close_isarstate; cs->bcs[1].BC_Close = close_isarstate;
cs->bcs[0].hw.isar.ftimer.function = (void *) ftimer_handler; setup_timer(&cs->bcs[0].hw.isar.ftimer, (void *)ftimer_handler,
cs->bcs[0].hw.isar.ftimer.data = (long) &cs->bcs[0]; (long)&cs->bcs[0]);
init_timer(&cs->bcs[0].hw.isar.ftimer); setup_timer(&cs->bcs[1].hw.isar.ftimer, (void *)ftimer_handler,
cs->bcs[1].hw.isar.ftimer.function = (void *) ftimer_handler; (long)&cs->bcs[1]);
cs->bcs[1].hw.isar.ftimer.data = (long) &cs->bcs[1];
init_timer(&cs->bcs[1].hw.isar.ftimer);
} }

View File

@ -169,9 +169,7 @@ void
L3InitTimer(struct l3_process *pc, struct L3Timer *t) L3InitTimer(struct l3_process *pc, struct L3Timer *t)
{ {
t->pc = pc; t->pc = pc;
t->tl.function = (void *) L3ExpireTimer; setup_timer(&t->tl, (void *)L3ExpireTimer, (long)t);
t->tl.data = (long) t;
init_timer(&t->tl);
} }
void void

View File

@ -278,9 +278,7 @@ int setup_TeleInt(struct IsdnCard *card)
cs->bcs[0].hw.hfc.send = NULL; cs->bcs[0].hw.hfc.send = NULL;
cs->bcs[1].hw.hfc.send = NULL; cs->bcs[1].hw.hfc.send = NULL;
cs->hw.hfc.fifosize = 7 * 1024 + 512; cs->hw.hfc.fifosize = 7 * 1024 + 512;
cs->hw.hfc.timer.function = (void *) TeleInt_Timer; setup_timer(&cs->hw.hfc.timer, (void *)TeleInt_Timer, (long)cs);
cs->hw.hfc.timer.data = (long) cs;
init_timer(&cs->hw.hfc.timer);
if (!request_region(cs->hw.hfc.addr, 2, "TeleInt isdn")) { if (!request_region(cs->hw.hfc.addr, 2, "TeleInt isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: TeleInt config port %x-%x already in use\n", "HiSax: TeleInt config port %x-%x already in use\n",

View File

@ -901,9 +901,8 @@ static void initW6692(struct IsdnCardState *cs, int part)
if (part & 1) { if (part & 1) {
cs->setstack_d = setstack_W6692; cs->setstack_d = setstack_W6692;
cs->DC_Close = DC_Close_W6692; cs->DC_Close = DC_Close_W6692;
cs->dbusytimer.function = (void *) dbusy_timer_handler; setup_timer(&cs->dbusytimer, (void *)dbusy_timer_handler,
cs->dbusytimer.data = (long) cs; (long)cs);
init_timer(&cs->dbusytimer);
resetW6692(cs); resetW6692(cs);
ph_command(cs, W_L1CMD_RST); ph_command(cs, W_L1CMD_RST);
cs->dc.w6692.ph_state = W_L1CMD_RST; cs->dc.w6692.ph_state = W_L1CMD_RST;

View File

@ -2370,9 +2370,8 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s
rs->state = CCPResetIdle; rs->state = CCPResetIdle;
rs->is = is; rs->is = is;
rs->id = id; rs->id = id;
init_timer(&rs->timer); setup_timer(&rs->timer, isdn_ppp_ccp_timer_callback,
rs->timer.data = (unsigned long)rs; (unsigned long)rs);
rs->timer.function = isdn_ppp_ccp_timer_callback;
is->reset->rs[id] = rs; is->reset->rs[id] = rs;
} }
return rs; return rs;

View File

@ -1812,9 +1812,8 @@ isdn_tty_modem_init(void)
info->isdn_channel = -1; info->isdn_channel = -1;
info->drv_index = -1; info->drv_index = -1;
info->xmit_size = ISDN_SERIAL_XMIT_SIZE; info->xmit_size = ISDN_SERIAL_XMIT_SIZE;
init_timer(&info->nc_timer); setup_timer(&info->nc_timer, isdn_tty_modem_do_ncarrier,
info->nc_timer.function = isdn_tty_modem_do_ncarrier; (unsigned long)info);
info->nc_timer.data = (unsigned long) info;
skb_queue_head_init(&info->xmit_queue); skb_queue_head_init(&info->xmit_queue);
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
skb_queue_head_init(&info->dtmf_queue); skb_queue_head_init(&info->dtmf_queue);

View File

@ -1092,9 +1092,7 @@ dspcreate(struct channel_req *crq)
ndsp->pcm_bank_tx = -1; ndsp->pcm_bank_tx = -1;
ndsp->hfc_conf = -1; /* current conference number */ ndsp->hfc_conf = -1; /* current conference number */
/* set tone timer */ /* set tone timer */
ndsp->tone.tl.function = (void *)dsp_tone_timeout; setup_timer(&ndsp->tone.tl, (void *)dsp_tone_timeout, (long)ndsp);
ndsp->tone.tl.data = (long) ndsp;
init_timer(&ndsp->tone.tl);
if (dtmfthreshold < 20 || dtmfthreshold > 500) if (dtmfthreshold < 20 || dtmfthreshold > 500)
dtmfthreshold = 200; dtmfthreshold = 200;

View File

@ -110,13 +110,11 @@ void
mISDN_FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft) mISDN_FsmInitTimer(struct FsmInst *fi, struct FsmTimer *ft)
{ {
ft->fi = fi; ft->fi = fi;
ft->tl.function = (void *) FsmExpireTimer;
ft->tl.data = (long) ft;
#if FSM_TIMER_DEBUG #if FSM_TIMER_DEBUG
if (ft->fi->debug) if (ft->fi->debug)
ft->fi->printdebug(ft->fi, "mISDN_FsmInitTimer %lx", (long) ft); ft->fi->printdebug(ft->fi, "mISDN_FsmInitTimer %lx", (long) ft);
#endif #endif
init_timer(&ft->tl); setup_timer(&ft->tl, (void *)FsmExpireTimer, (long)ft);
} }
EXPORT_SYMBOL(mISDN_FsmInitTimer); EXPORT_SYMBOL(mISDN_FsmInitTimer);

View File

@ -1443,9 +1443,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
hc->keep_tl.expires = jiffies + 2 * HZ; /* two seconds first time */ hc->keep_tl.expires = jiffies + 2 * HZ; /* two seconds first time */
add_timer(&hc->keep_tl); add_timer(&hc->keep_tl);
hc->timeout_tl.function = (void *)l1oip_timeout; setup_timer(&hc->timeout_tl, (void *)l1oip_timeout, (ulong)hc);
hc->timeout_tl.data = (ulong)hc;
init_timer(&hc->timeout_tl);
hc->timeout_on = 0; /* state that we have timer off */ hc->timeout_on = 0; /* state that we have timer off */
return 0; return 0;