diff options
author | phk <phk@FreeBSD.org> | 2006-01-04 09:59:07 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2006-01-04 09:59:07 +0000 |
commit | 3dc6c75d0c07ecc991a928fa05a5080a9147e442 (patch) | |
tree | 519e227322234fc0f957821d3fb2cd54618e2489 /sys | |
parent | 44d6de75f9eb511d1fb49fbc4e960cde63ef48f5 (diff) | |
download | FreeBSD-src-3dc6c75d0c07ecc991a928fa05a5080a9147e442.zip FreeBSD-src-3dc6c75d0c07ecc991a928fa05a5080a9147e442.tar.gz |
Deorbit ttymalloc() in preference for ttyalloc()
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/tty.c | 18 | ||||
-rw-r--r-- | sys/sys/tty.h | 1 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 1babc3d..363c31c 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2827,17 +2827,10 @@ ttyrel(struct tty *tp) * tty_open(). */ struct tty * -ttymalloc(struct tty *tp) +ttyalloc() { + struct tty *tp; - if (tp) { - /* - * XXX: Either this argument should go away, or we should - * XXX: require it and do a ttyrel(tp) here and allocate - * XXX: a new tty. For now do nothing. - */ - return(tp); - } tp = malloc(sizeof *tp, M_TTYS, M_WAITOK | M_ZERO); mtx_init(&tp->t_mtx, "tty", NULL, MTX_DEF); @@ -2862,13 +2855,6 @@ ttymalloc(struct tty *tp) return (tp); } -struct tty * -ttyalloc() -{ - - return (ttymalloc(NULL)); -} - static void ttypurge(struct cdev *dev) { diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 1eceefd..81f4f9c 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -360,7 +360,6 @@ void ttyinitmode(struct tty *tp, int echo, int speed); int ttyinput(int c, struct tty *tp); int ttylclose(struct tty *tp, int flag); void ttyldoptim(struct tty *tp); -struct tty *ttymalloc(struct tty *tp); int ttymodem(struct tty *tp, int flag); int tty_open(struct cdev *device, struct tty *tp); int ttyref(struct tty *tp); |