From 773e541e8d088fb20dd4451f1304f805a558728f Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 21 Aug 2020 00:03:24 +0000
Subject: [PATCH] Use devctl.h instead of bus.h to reduce newbus pollution.

There's no need for these parts of the kernel to know about newbus,
so narrow what is included to devctl.h for device_notify_*.

Suggested by: kib@
---
 sys/cam/cam_periph.c                                    | 2 +-
 sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c | 2 +-
 sys/geom/geom_dev.c                                     | 2 +-
 sys/geom/geom_disk.c                                    | 2 +-
 sys/kern/kern_conf.c                                    | 2 +-
 sys/kern/kern_rctl.c                                    | 2 +-
 sys/kern/kern_sig.c                                     | 2 +-
 sys/kern/vfs_mount.c                                    | 2 +-
 sys/net/if_ethersubr.c                                  | 2 +-
 sys/netinet/ip_carp.c                                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 2dcf493b3449..358e9901105b 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -39,12 +39,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bio.h>
 #include <sys/conf.h>
+#include <sys/devctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/devicestat.h>
-#include <sys/bus.h>
 #include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <vm/vm.h>
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c b/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
index c6ae4977d1cf..e810ae458140 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_sysevent.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/sbuf.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/nvpair.h>
 #include <sys/sunddi.h>
 #include <sys/sysevent.h>
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index e8de1f81475b..65453dcc9831 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/ctype.h>
 #include <sys/bio.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index eaba770828d0..d058f5298415 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/bio.h>
-#include <sys/bus.h>
 #include <sys/ctype.h>
+#include <sys/devctl.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/sbuf.h>
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 2d14081c0e3c..f4de19e527cf 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -32,8 +32,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
 #include <sys/bio.h>
+#include <sys/devctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c
index 9805a34d7474..68f03f2f6913 100644
--- a/sys/kern/kern_rctl.c
+++ b/sys/kern/kern_rctl.c
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/refcount.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 776e8a795b7c..019526cd0d5e 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
 #include <sys/acct.h>
-#include <sys/bus.h>
 #include <sys/capsicum.h>
 #include <sys/compressor.h>
 #include <sys/condvar.h>
+#include <sys/devctl.h>
 #include <sys/event.h>
 #include <sys/fcntl.h>
 #include <sys/imgact.h>
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 78b81f6eb3b8..84d14fadae1d 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/smp.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/eventhandler.h>
 #include <sys/fcntl.h>
 #include <sys/jail.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 0f23e0bc836c..178d8064e3af 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -40,7 +40,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/eventhandler.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 6b6ef67270b9..e71140fa6b1e 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bus.h>
+#include <sys/devctl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/limits.h>