diff options
| author | skrll <skrll@NetBSD.org> | 2016-07-11 10:55:35 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2016-07-11 10:55:35 +0000 |
| commit | 803cf0d624efe734c71af394ae785d36ff5d1008 (patch) | |
| tree | a961c48020ee26d09d594f8dc4fc59affbb19a9e /sys/dev/dec | |
| parent | cd885a79b3a97deae755bf4309b05a7ecc9da0dd (diff) | |
Don't use a callout unnecessarily - especially not this early
Diffstat (limited to 'sys/dev/dec')
| -rw-r--r-- | sys/dev/dec/lk201_ws.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sys/dev/dec/lk201_ws.c b/sys/dev/dec/lk201_ws.c index 1ce77046de3..207fcd50111 100644 --- a/sys/dev/dec/lk201_ws.c +++ b/sys/dev/dec/lk201_ws.c @@ -1,4 +1,4 @@ -/* $NetBSD: lk201_ws.c,v 1.9 2015/01/02 21:32:26 jklos Exp $ */ +/* $NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.9 2015/01/02 21:32:26 jklos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,8 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.9 2015/01/02 21:32:26 jklos Exp $"); void lk201_identify(void *); -static callout_t lkkbd_id; - static const char *lkkbd_descr[] = { "no keyboard", "LK-201 keyboard", @@ -82,20 +80,6 @@ lk201_init(struct lk201_state *lks) send(lks, LK_LED_ALL); lks->leds_state = 0; - callout_init(&lkkbd_id, 0); - callout_setfunc(&lkkbd_id, lk201_identify, lks); - callout_schedule(&lkkbd_id, 0); - - return (0); -} - -void -lk201_identify(void *v) -{ - struct lk201_state *lks = v; - int i; - - callout_destroy(&lkkbd_id); /* * Swallow all the keyboard acknowledges from lk201_init(). * There should be 14 of them - one per LK_CMD_MODE command. @@ -133,6 +117,8 @@ lk201_identify(void *v) lks->waitack = 0; printf("lkkbd0: %s\n", lkkbd_descr[lks->kbdtype]); + + return 0; } int |
