This isn't functionally identical. In some cases a hint to disable

unit 0 would in fact disable all units.

This reverts r241856

Approved by: cperciva (implicit)

9 files changed, 19 insertions, 0 deletions

diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index 0a47268..09ebb2b 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -81,6 +81,8 @@ agp_ali_probe(device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	desc = agp_ali_match(dev);
 	if (desc) {
 		device_set_desc(dev, desc);
diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index 2a9005b..fabb9b1 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -203,6 +203,8 @@ agp_amd_probe(device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	desc = agp_amd_match(dev);
 	if (desc) {
 		device_set_desc(dev, desc);
diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c
index 391ac4a..e2bfa67 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/agp_amd64.c
@@ -152,6 +152,8 @@ agp_amd64_probe(device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	if ((desc = agp_amd64_match(dev))) {
 		device_set_desc(dev, desc);
 		return (BUS_PROBE_DEFAULT);
diff --git a/sys/dev/agp/agp_apple.c b/sys/dev/agp/agp_apple.c
index 2de843a..e16e114 100644
--- a/sys/dev/agp/agp_apple.c
+++ b/sys/dev/agp/agp_apple.c
@@ -71,6 +71,9 @@ static int
 agp_apple_probe(device_t dev)
 {
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
+
 	if (pci_get_class(dev) != PCIC_BRIDGE
 	    || pci_get_subclass(dev) != PCIS_BRIDGE_HOST)
 		return (ENXIO);
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index be3448b..39d6cba 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -860,6 +860,8 @@ agp_i810_probe(device_t dev)
 	const struct agp_i810_match *match;
 	int err;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	match = agp_i810_match(dev);
 	if (match == NULL)
 		return (ENXIO);
diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index f69a56d..ac10c8e 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -117,6 +117,8 @@ agp_intel_probe(device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	desc = agp_intel_match(dev);
 	if (desc) {
 		device_set_desc(dev, desc);
diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c
index db726c9..6db87c6 100644
--- a/sys/dev/agp/agp_nvidia.c
+++ b/sys/dev/agp/agp_nvidia.c
@@ -117,6 +117,8 @@ agp_nvidia_probe (device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	desc = agp_nvidia_match(dev);
 	if (desc) {
 		device_set_desc(dev, desc);
diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index 1e52d4e..e8f542b 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -113,6 +113,8 @@ agp_sis_probe(device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	desc = agp_sis_match(dev);
 	if (desc) {
 		device_set_desc(dev, desc);
diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index c6b4aba..c561513 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -147,6 +147,8 @@ agp_via_probe(device_t dev)
 {
 	const char *desc;
 
+	if (resource_disabled("agp", device_get_unit(dev)))
+		return (ENXIO);
 	desc = agp_via_match(dev);
 	if (desc) {
 		device_set_desc(dev, desc);