Pick the hotchar out of the tty structure instead of caching private

copies.

No current line disciplines have a dynamically changing hotchar, and
expecting to receive anything sensible during a change in ldisc is
insane so no locking of the hotchar field is necessary.

2 files changed, 2 insertions, 3 deletions

diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index ad7d426..ffe26cb 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -742,7 +742,7 @@ open_top:
 	}
 
 	error = ttyld_open(tp, dev);
-	pp->sp_hotchar = ttyldoptim(tp);
+	ttyldoptim(tp);
 	if (tp->t_state & TS_ISOPEN && IS_CALLOUT(mynor))
 		pp->sp_active_out = TRUE;
 
@@ -1024,7 +1024,7 @@ siioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	}
 
 	error = ttyioctl(dev, cmd, data, flag, td);
-	pp->sp_hotchar = ttyldoptim(tp);
+	ttyldoptim(tp);
 	if (error != ENOTTY)
 		goto out;
 
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index a0c1ebd..3222e2e 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -334,7 +334,6 @@ struct si_port {
 	int		sp_dtr_wait;	/* DTR holddown in hz */
 	int		sp_delta_overflows;
 	u_int		sp_wopeners;	/* # procs waiting DCD */
-	u_char		sp_hotchar;	/* ldisc specific ASAP char */
 	/* Initial state. */
 	struct termios	sp_iin;
 	struct termios	sp_iout;