diff options
| author | Eitan Adler <eadler@FreeBSD.org> | 2012-10-22 03:41:14 +0000 |
|---|---|---|
| committer | Eitan Adler <eadler@FreeBSD.org> | 2012-10-22 03:41:14 +0000 |
| commit | 76b7512247ab3bdfffaa4663ff1cc9b6c29cc915 (patch) | |
| tree | 170a58f7db6c673c79f71ba7f0ca237a68dc273b | |
| parent | c9657073118a0216de5987ebf590896db2c4d62b (diff) | |
Notes
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 f25dac771234..1f18c63dfaa2 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 cfe08ed1dbfe..5e0466d08eff 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 3f047cce6b85..e7d697cf39cd 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 40476e02bd98..4ac52225296f 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 09ebb2bdb6da..0a4726815ea7 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 fabb9b13472c..2a9005b02fbc 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 e2bfa6764541..391ac4a435c1 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 e16e11489a7a..2de843ac4786 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 39d6cba8a557..be3448be8aee 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 ac10c8ee1be7..f69a56d0584b 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 6db87c625bf9..db726c9ec162 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 e8f542bfe306..1e52d4efba8e 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 c561513b1d4d..c6b4aba435dc 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 4256381f5312..da0ec5b63a55 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 6d106aed0cb8..53714c6e297f 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 5fc8c4128cb5..8c25679e8062 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 54e5a4365e87..8c82222b5394 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 112b538f5585..c64b417f15ff 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 13189108c060..ae3665843640 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 cce734695ace..aeb32952de68 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 6eeac7cee381..00a42c6cba63 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 d9f028ba5389..e7011af5a3e5 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 1acb3f0bf960..37f602b6b196 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 a21b37cdf095..16e653548fc2 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 d92fa448be08..c15a03b63b8e 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 08721279b6cd..42c6c86e1c08 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 bf5071f0dedd..5477383f3dcc 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 cc9502d04556..41660cbe15e3 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 e11b4a8d499b..4e37def42a43 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 266d78396db9..ec457bceef89 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); } |
