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
This commit is contained in:
parent
c965707311
commit
76b7512247
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=241856
@ -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);
|
||||
}
|
||||
|
@ -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) {
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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");
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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));
|
||||
|
@ -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));
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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");
|
||||
|
@ -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.
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -84,8 +84,6 @@ elcr_probe(void)
|
||||
printf(" E");
|
||||
printf("\n");
|
||||
}
|
||||
if (resource_disabled("elcr", 0))
|
||||
return (ENXIO);
|
||||
elcr_found = 1;
|
||||
return (0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user