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/sx/sx.c b/sys/dev/sx/sx.c
index 8a523fa..e7f5d82 100644
--- a/sys/dev/sx/sx.c
+++ b/sys/dev/sx/sx.c
@@ -477,7 +477,7 @@ open_top:
 	}
 
 	error = ttyld_open(tp, dev);
-	pp->sp_hotchar = ttyldoptim(tp);
+	ttyldoptim(tp);
 	if (tp->t_state & TS_ISOPEN && DEV_IS_CALLOUT(mynor))
 		pp->sp_active_out = TRUE;
 
@@ -812,7 +812,7 @@ sxioctl(
 	}
 
 	error = ttyioctl(dev, cmd, data, flag, p);
-	pp->sp_hotchar = ttyldoptim(tp);
+	ttyldoptim(tp);
 	if (error != ENOTTY)
 		goto out;
 
diff --git a/sys/dev/sx/sx.h b/sys/dev/sx/sx.h
index 5d142a7..3d4c971 100644
--- a/sys/dev/sx/sx.h
+++ b/sys/dev/sx/sx.h
@@ -42,7 +42,6 @@ struct sx_port {
 	int		sp_dtr_wait;	/* DTR holddown in hz */
 	int		sp_delta_overflows;
 	u_int		sp_wopeners;	/* Processes waiting for DCD.         */
-	u_char		sp_hotchar;	/* ldisc specific ASAP char */
 	struct termios	sp_iin;		/* Initial state.                     */
 	struct termios	sp_iout;
 	struct termios	sp_lin;		/* Lock state.                        */