summaryrefslogtreecommitdiffstats
path: root/sys/dev/ips
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2003-07-02 16:09:02 +0000
committerjhb <jhb@FreeBSD.org>2003-07-02 16:09:02 +0000
commit17958a749f60b50092d0ae5d6171bdc924cbed02 (patch)
tree24843831a3541cd5733aaad746e1a57206e1e21f /sys/dev/ips
parentea0bd1523805444400e26e89587d5f1a933ff7dd (diff)
downloadFreeBSD-src-17958a749f60b50092d0ae5d6171bdc924cbed02.zip
FreeBSD-src-17958a749f60b50092d0ae5d6171bdc924cbed02.tar.gz
- Use the new resource_disabled() helper function to see if devices are
disabled. - Change the apm driver to match the acpi driver's behavior by checking to see if the device is disabled in the identify routine instead of in the probe routine. This way if the device is disabled it is never created. Note that a few places (ips(4), Alpha SMP) used "disable" instead of "disabled" for their hint names, and these hints must be changed to "disabled". If this is a big problem, resource_disabled() can always be changed to honor both names.
Diffstat (limited to 'sys/dev/ips')
-rw-r--r--sys/dev/ips/ips_pci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index 81fa0e6..8cda989 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -50,13 +50,10 @@ static int ips_pci_probe(device_t dev)
static int ips_pci_attach(device_t dev)
{
u_int32_t command;
- int tval;
ips_softc_t *sc;
- tval = 0;
- if (resource_int_value(device_get_name(dev), device_get_unit(dev),
- "disable", &tval) == 0 && tval) {
+ if (resource_disabled(device_get_name(dev), device_get_unit(dev))) {
device_printf(dev, "device is disabled\n");
/* but return 0 so the !$)$)*!$*) unit isn't reused */
return (0);
OpenPOWER on IntegriCloud