From e5979322ba19bf6972057bbd2020b03d31f0120e Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Thu, 14 Oct 2004 22:21:59 +0000 Subject: Remove local hacks to set flags now that the device probe does this for us. Tested on every device except sio_pci and the pc98 fd.c. Perhaps something similar should be done for the "disabled" hints also. MFC after: 2 weeks --- sys/dev/atkbdc/atkbdc_isa.c | 2 -- sys/dev/atkbdc/atkbdc_subr.c | 2 -- sys/dev/fdc/fdc.c | 2 -- sys/dev/sio/sio_pci.c | 4 ---- 4 files changed, 10 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index 153ed9f9d8e46..d0476a315d448 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -252,8 +252,6 @@ atkbdc_add_child(device_t bus, int order, char *name, int unit) resource_list_add(&ivar->resources, SYS_RES_IRQ, ivar->rid, t, t, 1); - if (resource_int_value(name, unit, "flags", &t) == 0) - device_set_flags(child, t); if (resource_disabled(name, unit)) device_disable(child); diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index 153ed9f9d8e46..d0476a315d448 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -252,8 +252,6 @@ atkbdc_add_child(device_t bus, int order, char *name, int unit) resource_list_add(&ivar->resources, SYS_RES_IRQ, ivar->rid, t, t, 1); - if (resource_int_value(name, unit, "flags", &t) == 0) - device_set_flags(child, t); if (resource_disabled(name, unit)) device_disable(child); diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 8afaadd79a28f..c17e5f22a46c1 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -1697,8 +1697,6 @@ fdc_add_child(device_t dev, const char *name, int unit) device_set_ivars(child, ivar); ivar->fdunit = unit; ivar->fdtype = FDT_NONE; - if (resource_int_value(name, unit, "flags", &flags) == 0) - device_set_flags(child, flags); if (resource_disabled(name, unit)) device_disable(child); return (child); diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c index efd32baabd1df..d79f12a138d39 100644 --- a/sys/dev/sio/sio_pci.c +++ b/sys/dev/sio/sio_pci.c @@ -96,7 +96,6 @@ sio_pci_attach(dev) { u_int32_t type; struct pci_ids *id; - int flags; type = pci_get_devid(dev); id = pci_ids; @@ -105,9 +104,6 @@ sio_pci_attach(dev) if (id->desc == NULL) return (ENXIO); sio_pci_kludge_unit(dev); - if (resource_int_value("sio", device_get_unit(dev), "flags", &flags) - == 0) - device_set_flags(dev, flags); return (sioattach(dev, id->rid, 0UL)); } -- cgit v1.3