[src-draft/trunk]: src/sys/dev Tidy up includes.

[Taylor R Campbell <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/95c0eef2b956
branches:  trunk
changeset: 934070:95c0eef2b956
user:      Taylor R Campbell <riastradh%NetBSD.org@localhost>
date:      Fri May 29 19:53:51 2020 +0000

description:
Tidy up includes.

diffstat:

 sys/dev/cgd.c        |  23 ++++++++++++-----------
 sys/dev/cgd_crypto.c |   6 +++---
 sys/dev/cgdvar.h     |   1 +
 3 files changed, 16 insertions(+), 14 deletions(-)

diffs (76 lines):

diff -r aaa2df0ce71d -r 95c0eef2b956 sys/dev/cgd.c
--- a/sys/dev/cgd.c     Fri May 29 19:50:57 2020 +0000
+++ b/sys/dev/cgd.c     Fri May 29 19:53:51 2020 +0000
@@ -34,28 +34,29 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
-#include <sys/kmem.h>
-#include <sys/module.h>
-#include <sys/pool.h>
-#include <sys/ioctl.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
+#include <sys/errno.h>
 #include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/kmem.h>
+#include <sys/module.h>
 #include <sys/namei.h> /* for pathbuf */
-#include <sys/vnode.h>
-#include <sys/conf.h>
+#include <sys/pool.h>
+#include <sys/proc.h>
 #include <sys/syslog.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
 #include <sys/workqueue.h>
-#include <sys/cpu.h>
 
+#include <dev/cgd_crypto.h>
+#include <dev/cgdvar.h>
 #include <dev/dkvar.h>
-#include <dev/cgdvar.h>
 
 #include <miscfs/specfs/specdev.h> /* for v_rdev */
 
diff -r aaa2df0ce71d -r 95c0eef2b956 sys/dev/cgd_crypto.c
--- a/sys/dev/cgd_crypto.c      Fri May 29 19:50:57 2020 +0000
+++ b/sys/dev/cgd_crypto.c      Fri May 29 19:53:51 2020 +0000
@@ -40,14 +40,14 @@
 __KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.17 2019/12/14 16:58:38 riastradh Exp $");
 
 #include <sys/param.h>
+#include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 
 #include <dev/cgd_crypto.h>
 
-#include <crypto/rijndael/rijndael-api-fst.h>
+#include <crypto/blowfish/blowfish.h>
 #include <crypto/des/des.h>
-#include <crypto/blowfish/blowfish.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 
 /*
  * The general framework provides only one generic function.
diff -r aaa2df0ce71d -r 95c0eef2b956 sys/dev/cgdvar.h
--- a/sys/dev/cgdvar.h  Fri May 29 19:50:57 2020 +0000
+++ b/sys/dev/cgdvar.h  Fri May 29 19:53:51 2020 +0000
@@ -66,6 +66,7 @@
 #ifdef _KERNEL
 
 #include <dev/cgd_crypto.h>
+#include <dev/dkvar.h>
 
 /* This cryptdata structure is here rather than cgd_crypto.h, since
  * it stores local state which will not be generalised beyond the