diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 01ac80900a14..9a701d7ba2e8 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1229,7 +1229,7 @@ tty_makedev(struct tty *tp, struct ucred *cred, const char *fmt, ...)
 
 		/* Slave call-out devices. */
 		if (tp->t_flags & TF_INITLOCK) {
-			dev = make_dev_cred(&ttyil_cdevsw, 
+			dev = make_dev_cred(&ttyil_cdevsw,
 			    TTYUNIT_CALLOUT | TTYUNIT_INIT, cred,
 			    UID_UUCP, GID_DIALER, 0660, "cua%s.init", name);
 			dev_depends(tp->t_dev, dev);
diff --git a/sys/kern/tty_info.c b/sys/kern/tty_info.c
index d2b059ca41b0..6849d0b06ed1 100644
--- a/sys/kern/tty_info.c
+++ b/sys/kern/tty_info.c
@@ -109,7 +109,7 @@ thread_compare(struct thread *td, struct thread *td2)
 
 	/*
 	 * Fetch running stats, pctcpu usage, and interruptable flag.
- 	 */
+	 */
 	thread_lock(td);
 	runa = TD_IS_RUNNING(td) | TD_ON_RUNQ(td);
 	slpa = td->td_flags & TDF_SINTR;
@@ -173,7 +173,7 @@ proc_compare(struct proc *p1, struct proc *p2)
 	PROC_LOCK(p2);
 	runb = proc_sum(p2, &estb);
 	PROC_UNLOCK(p2);
-	
+
 	/*
 	 * see if at least one of them is runnable
 	 */
diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c
index 2a0bb4b7c6f7..1ac204b3aaa7 100644
--- a/sys/kern/tty_ttydisc.c
+++ b/sys/kern/tty_ttydisc.c
@@ -661,7 +661,6 @@ ttydisc_echo(struct tty *tp, char c, int quote)
 	return ttydisc_echo_force(tp, c, quote);
 }
 
-
 static void
 ttydisc_reprint_char(void *d, char c, int quote)
 {
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index 68a411ea1080..8d7547f5795a 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -105,7 +105,7 @@ struct winsize {
 #define		TIOCM_SR	0020		/* secondary receive */
 #define		TIOCM_CTS	0040		/* clear to send */
 #define		TIOCM_DCD	0100		/* data carrier detect */
-#define		TIOCM_RI 	0200		/* ring indicate */
+#define		TIOCM_RI	0200		/* ring indicate */
 #define		TIOCM_DSR	0400		/* data set ready */
 #define		TIOCM_CD	TIOCM_DCD
 #define		TIOCM_CAR	TIOCM_DCD
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index 5813bda62076..409ebc7da4e1 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -79,9 +79,9 @@
 #define	CSTART		CTRL('Q')
 #define	CSTOP		CTRL('S')
 #define	CLNEXT		CTRL('V')
-#define	CDISCARD 	CTRL('O')
-#define	CWERASE 	CTRL('W')
-#define	CREPRINT 	CTRL('R')
+#define	CDISCARD	CTRL('O')
+#define	CWERASE		CTRL('W')
+#define	CREPRINT	CTRL('R')
 #define	CEOT		CEOF
 /* compat */
 #define	CBRK		CEOL