Now that device disabling is generic, remove extraneous code from the

device drivers that used to provide this feature.

Reviewed by:	des
Approved by:	cperciva
MFC after:	1 week

30 files changed, 0 insertions, 91 deletions

diff --git a/sys/arm/xscale/pxa/pxa_smi.c b/sys/arm/xscale/pxa/pxa_smi.c
index f25dac7..1f18c63 100644
--- a/sys/arm/xscale/pxa/pxa_smi.c
+++ b/sys/arm/xscale/pxa/pxa_smi.c
@@ -82,9 +82,6 @@ static int
 pxa_smi_probe(device_t dev)
 {
 
-	if (resource_disabled("smi", device_get_unit(dev)))
-		return (ENXIO);
-
 	device_set_desc(dev, "Static Memory Interface");
 	return (0);
 }
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index cfe08ed..5e0466d0 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -377,10 +377,6 @@ acpi_identify(void)
     if (!cold)
 	return (ENXIO);
 
-    /* Check that we haven't been disabled with a hint. */
-    if (resource_disabled("acpi", 0))
-	return (ENXIO);
-
     /* Check for other PM systems. */
     if (power_pm_get_type() != POWER_PM_TYPE_NONE &&
 	power_pm_get_type() != POWER_PM_TYPE_ACPI) {
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
index 3f047cc..e7d697c 100644
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -175,9 +175,6 @@ acpi_perf_probe(device_t dev)
 	ACPI_BUFFER buf;
 	int error, rid, type;
 
-	if (resource_disabled("acpi_perf", 0))
-		return (ENXIO);
-
 	/*
 	 * Check the performance state registers.  If they are of type
 	 * "functional fixed hardware", we attach quietly since we will
diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c
index 40476e0..4ac5222 100644
--- a/sys/dev/acpica/acpi_throttle.c
+++ b/sys/dev/acpica/acpi_throttle.c
@@ -167,9 +167,6 @@ static int
 acpi_throttle_probe(device_t dev)
 {
 
-	if (resource_disabled("acpi_throttle", 0))
-		return (ENXIO);
-
 	/*
 	 * On i386 platforms at least, ACPI throttling is accomplished by
 	 * the chipset modulating the STPCLK# pin based on the duty cycle.
diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index 09ebb2b..0a47268 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -81,8 +81,6 @@ 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 fabb9b1..2a9005b 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -203,8 +203,6 @@ 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 e2bfa67..391ac4a 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/agp_amd64.c
@@ -152,8 +152,6 @@ 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 e16e114..2de843a 100644
--- a/sys/dev/agp/agp_apple.c
+++ b/sys/dev/agp/agp_apple.c
@@ -71,9 +71,6 @@ 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 39d6cba..be3448b 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -860,8 +860,6 @@ 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 ac10c8e..f69a56d 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -117,8 +117,6 @@ 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 6db87c6..db726c9 100644
--- a/sys/dev/agp/agp_nvidia.c
+++ b/sys/dev/agp/agp_nvidia.c
@@ -117,8 +117,6 @@ 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 e8f542b..1e52d4e 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -113,8 +113,6 @@ 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 c561513..c6b4aba 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -147,8 +147,6 @@ 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);
diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c
index 4256381..da0ec5b 100644
--- a/sys/dev/amdsbwd/amdsbwd.c
+++ b/sys/dev/amdsbwd/amdsbwd.c
@@ -267,8 +267,6 @@ amdsbwd_identify(driver_t *driver, device_t parent)
 	device_t		child;
 	device_t		smb_dev;
 
-	if (resource_disabled("amdsbwd", 0))
-		return;
 	if (device_find_child(parent, "amdsbwd", -1) != NULL)
 		return;
 
diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 6d106ae..53714c6 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -185,9 +185,6 @@ amdtemp_probe(device_t dev)
 {
 	uint32_t family, model;
 
-	if (resource_disabled("amdtemp", 0))
-		return (ENXIO);
-
 	family = CPUID_TO_FAMILY(cpu_id);
 	model = CPUID_TO_MODEL(cpu_id);
 
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index 5fc8c41..8c25679 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -291,8 +291,6 @@ asmc_probe(device_t dev)
 {
 	struct asmc_model *model;
 
-	if (resource_disabled("asmc", 0))
-		return (ENXIO);
 	if (ACPI_ID_PROBE(device_get_parent(dev), dev, asmc_ids) == NULL)
 		return (ENXIO);
 	
diff --git a/sys/dev/coretemp/coretemp.c b/sys/dev/coretemp/coretemp.c
index 54e5a43..8c82222 100644
--- a/sys/dev/coretemp/coretemp.c
+++ b/sys/dev/coretemp/coretemp.c
@@ -138,8 +138,6 @@ coretemp_identify(driver_t *driver, device_t parent)
 static int
 coretemp_probe(device_t dev)
 {
-	if (resource_disabled("coretemp", 0))
-		return (ENXIO);
 
 	device_set_desc(dev, "CPU On-Die Thermal Sensors");
 
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 112b538..c64b417 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -472,11 +472,6 @@ em_attach(device_t dev)
 
 	INIT_DEBUGOUT("em_attach: begin");
 
-	if (resource_disabled("em", device_get_unit(dev))) {
-		device_printf(dev, "Disabled by device hint\n");
-		return (ENXIO);
-	}
-
 	adapter = device_get_softc(dev);
 	adapter->dev = adapter->osdep.dev = dev;
 	hw = &adapter->hw;
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c
index 1318910..ae36658 100644
--- a/sys/dev/e1000/if_igb.c
+++ b/sys/dev/e1000/if_igb.c
@@ -460,11 +460,6 @@ igb_attach(device_t dev)
 
 	INIT_DEBUGOUT("igb_attach: begin");
 
-	if (resource_disabled("igb", device_get_unit(dev))) {
-		device_printf(dev, "Disabled by device hint\n");
-		return (ENXIO);
-	}
-
 	adapter = device_get_softc(dev);
 	adapter->dev = adapter->osdep.dev = dev;
 	IGB_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c
index cce7346..aeb3295 100644
--- a/sys/dev/e1000/if_lem.c
+++ b/sys/dev/e1000/if_lem.c
@@ -390,11 +390,6 @@ lem_attach(device_t dev)
 
 	INIT_DEBUGOUT("lem_attach: begin");
 
-	if (resource_disabled("lem", device_get_unit(dev))) {
-		device_printf(dev, "Disabled by device hint\n");
-		return (ENXIO);
-	}
-
 	adapter = device_get_softc(dev);
 	adapter->dev = adapter->osdep.dev = dev;
 	EM_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index 6eeac7c..00a42c6 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -298,9 +298,6 @@ static int
 glxiic_probe(device_t dev)
 {
 
-	if (resource_disabled("glxiic", device_get_unit(dev)))
-		return (ENXIO);
-
 	device_set_desc(dev, "AMD Geode CS5536 SMBus controller");
 
 	return (BUS_PROBE_DEFAULT);
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index d9f028b..e7011af 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -401,11 +401,6 @@ ixgbe_attach(device_t dev)
 
 	INIT_DEBUGOUT("ixgbe_attach: begin");
 
-	if (resource_disabled("ixgbe", device_get_unit(dev))) {
-		device_printf(dev, "Disabled by device hint\n");
-		return (ENXIO);
-	}
-
 	/* Allocate, clear, and link in our adapter structure */
 	adapter = device_get_softc(dev);
 	adapter->dev = adapter->osdep.dev = dev;
diff --git a/sys/dev/ixgbe/ixv.c b/sys/dev/ixgbe/ixv.c
index 1acb3f0..37f602b 100644
--- a/sys/dev/ixgbe/ixv.c
+++ b/sys/dev/ixgbe/ixv.c
@@ -299,11 +299,6 @@ ixv_attach(device_t dev)
 
 	INIT_DEBUGOUT("ixv_attach: begin");
 
-	if (resource_disabled("ixgbe", device_get_unit(dev))) {
-		device_printf(dev, "Disabled by device hint\n");
-		return (ENXIO);
-	}
-
 	/* Allocate, clear, and link in our adapter structure */
 	adapter = device_get_softc(dev);
 	adapter->dev = adapter->osdep.dev = dev;
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index a21b37c..16e6535 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -378,8 +378,6 @@ kbdmux_configure(int flags)
 static int
 kbdmux_probe(int unit, void *arg, int flags)
 {
-	if (resource_disabled(KEYBOARD_NAME, unit))
-		return (ENXIO);
 
 	return (0);
 }
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index d92fa44..c15a03b 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -3050,11 +3050,6 @@ emu_pci_attach(device_t dev)
 	sc = device_get_softc(dev);
 	unit = device_get_unit(dev);
 
-	if (resource_disabled("emu10kx", unit)) {
-		device_printf(dev, "disabled by kernel hints\n");
-		return (ENXIO); /* XXX to avoid unit reuse */
-	}
-
 	/* Get configuration */
 
 	sc->ctx = device_get_sysctl_ctx(dev);
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 0872127..42c6c86 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -268,9 +268,6 @@ acpi_find_table(const char *sig)
 	vm_paddr_t addr;
 	int i, count;
 
-	if (resource_disabled("acpi", 0))
-		return (0);
-
 	/*
 	 * Map in the RSDP.  Since ACPI uses AcpiOsMapMemory() which in turn
 	 * calls pmap_mapbios() to find the RSDP, we assume that we can use
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index bf5071f..5477383 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -878,9 +878,6 @@ apm_identify(driver_t *driver, device_t parent)
 		return;
 	}
 
-	if (resource_disabled("apm", 0))
-		return;
-
 	child = BUS_ADD_CHILD(parent, 0, "apm", 0);
 	if (child == NULL)
 		panic("apm_identify");
diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c
index cc9502d..41660cb 100644
--- a/sys/x86/cpufreq/est.c
+++ b/sys/x86/cpufreq/est.c
@@ -991,9 +991,6 @@ est_probe(device_t dev)
 	uint64_t msr;
 	int error, type;
 
-	if (resource_disabled("est", 0))
-		return (ENXIO);
-
 	/*
 	 * If the ACPI perf driver has attached and is not just offering
 	 * info, let it manage things.
diff --git a/sys/x86/cpufreq/p4tcc.c b/sys/x86/cpufreq/p4tcc.c
index e11b4a8..4e37def 100644
--- a/sys/x86/cpufreq/p4tcc.c
+++ b/sys/x86/cpufreq/p4tcc.c
@@ -139,10 +139,6 @@ p4tcc_identify(driver_t *driver, device_t parent)
 static int
 p4tcc_probe(device_t dev)
 {
-
-	if (resource_disabled("p4tcc", 0))
-		return (ENXIO);
-
 	device_set_desc(dev, "CPU Frequency Thermal Control");
 	return (0);
 }
diff --git a/sys/x86/isa/elcr.c b/sys/x86/isa/elcr.c
index 266d783..ec457bc 100644
--- a/sys/x86/isa/elcr.c
+++ b/sys/x86/isa/elcr.c
@@ -84,8 +84,6 @@ elcr_probe(void)
 				printf("  E");
 		printf("\n");
 	}
-	if (resource_disabled("elcr", 0))
-		return (ENXIO);
 	elcr_found = 1;
 	return (0);
 }