4 files changed, 5 insertions, 8 deletions

diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 7dbe02a02bc4..2618adfed7c3 100644
--- a/sys/isa/atkbdc_isa.c
+++ b/sys/isa/atkbdc_isa.c
@@ -255,7 +255,7 @@ atkbdc_add_child(device_t bus, int order, char *name, int unit)
 
 	if (resource_int_value(name, unit, "flags", &t) == 0)
 		device_set_flags(child, t);
-	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
+	if (resource_disabled(name, unit))
 		device_disable(child);
 
 	device_set_ivars(child, ivar);
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 7d30d8f90c1e..5346144d8181 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -973,7 +973,7 @@ fdc_detach(device_t dev)
 static void
 fdc_add_child(device_t dev, const char *name, int unit)
 {
-	int	disabled, flags;
+	int	flags;
 	struct fdc_ivars *ivar;
 	device_t child;
 
@@ -990,8 +990,7 @@ fdc_add_child(device_t dev, const char *name, int unit)
 	device_set_ivars(child, ivar);
 	if (resource_int_value(name, unit, "flags", &flags) == 0)
 		 device_set_flags(child, flags);
-	if (resource_int_value(name, unit, "disabled", &disabled) == 0
-	    && disabled != 0)
+	if (resource_disabled(name, unit))
 		device_disable(child);
 }
 
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index aeed43220f6d..dd0496760536 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -79,7 +79,7 @@ isahint_add_device(device_t parent, const char *name, int unit)
 	if (resource_int_value(name, unit, "flags", &t) == 0)
 		device_set_flags(child, t);
 
-	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
+	if (resource_disabled(name, unit))
 		device_disable(child);
 }
 
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index b4a52630ec4a..d88da8951ec5 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -195,14 +195,12 @@ sc_softc_t
 int
 sc_get_cons_priority(int *unit, int *flags)
 {
-	int disabled;
 	const char *at;
 	int u, f;
 
 	*unit = -1;
 	for (u = 0; u < 16; u++) {
-		if ((resource_int_value(SC_DRIVER_NAME, u, "disabled",
-					&disabled) == 0) && disabled)
+		if (resource_disabled(SC_DRIVER_NAME, u))
 			continue;
 		if (resource_string_value(SC_DRIVER_NAME, u, "at", &at) != 0)
 			continue;