diff options
| author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 22:02:25 +0000 |
| commit | a415512fd4b3c95c87808401c97e649c8ac7f41e (patch) | |
| tree | 8463ee0d001498dfdefc34fc8911c491b2f0ecf0 /sys/pccard/pcic.c | |
| parent | 52ace446d29ab170f74f1db02832f24b01e04f20 (diff) | |
| download | FreeBSD-src-a415512fd4b3c95c87808401c97e649c8ac7f41e.zip FreeBSD-src-a415512fd4b3c95c87808401c97e649c8ac7f41e.tar.gz | |
Update for new callout interface.
Diffstat (limited to 'sys/pccard/pcic.c')
| -rw-r--r-- | sys/pccard/pcic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index a30b0e4..368c4f2 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -128,6 +128,8 @@ static void pcic_resume(struct slot *); static void pcic_disable __P((struct slot *)); static void pcic_mapirq __P((struct slot *, int)); static timeout_t pcictimeout; +static struct callout_handle pcictimeout_ch + = CALLOUT_HANDLE_INITIALIZER(&pcictimeout_ch); #ifdef LKM static int pcic_handle __P((struct lkm_table *lkmtp, int cmd)); #endif @@ -307,7 +309,7 @@ pcic_unload(struct lkm_table *lkmtp, int cmd) int slot; struct pcic_slot *sp = pcic_slots; - untimeout(pcictimeout,0); + untimeout(pcictimeout,0, pcictimeout_ch); if (pcic_irq) { for (slot = 0; slot < PCIC_MAX_SLOTS; slot++, sp++) { if (sp->slotp) @@ -848,7 +850,7 @@ pcic_probe(void) } #endif /* PC98 */ if (validslots) - timeout(pcictimeout,0,hz/2); + pcictimeout_ch = timeout(pcictimeout,0,hz/2); return(validslots); } @@ -1109,7 +1111,7 @@ pcic_disable(struct slot *slotp) static void pcictimeout(void *chan) { - timeout(pcictimeout,0,hz/2); + pcictimeout_ch = timeout(pcictimeout,0,hz/2); pcicintr(0); } |
