Author: eadler
Date: Tue Oct 30 04:06:12 2012
New Revision: 242340
URL: http://svn.freebsd.org/changeset/base/242340
Log:
MFC r241917:
Now that device disabling is generic, remove extraneous code from the
device drivers that used to provide this feature.
Approved by: cperciva (implicit)
Modified:
stable/9/sys/dev/e1000/if_lem.c
stable/9/sys/dev/ixgbe/ixgbe.c
stable/9/sys/dev/ixgbe/ixv.c
stable/9/sys/dev/sound/pci/emu10kx.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
Modified: stable/9/sys/dev/e1000/if_lem.c
==============================================================================
--- stable/9/sys/dev/e1000/if_lem.c Tue Oct 30 03:30:01 2012
(r242339)
+++ stable/9/sys/dev/e1000/if_lem.c Tue Oct 30 04:06:12 2012
(r242340)
@@ -391,11 +391,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));
Modified: stable/9/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixgbe.c Tue Oct 30 03:30:01 2012
(r242339)
+++ stable/9/sys/dev/ixgbe/ixgbe.c Tue Oct 30 04:06:12 2012
(r242340)
@@ -399,11 +399,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;
Modified: stable/9/sys/dev/ixgbe/ixv.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixv.c Tue Oct 30 03:30:01 2012
(r242339)
+++ stable/9/sys/dev/ixgbe/ixv.c Tue Oct 30 04:06:12 2012
(r242340)
@@ -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;
Modified: stable/9/sys/dev/sound/pci/emu10kx.c
==============================================================================
--- stable/9/sys/dev/sound/pci/emu10kx.c Tue Oct 30 03:30:01 2012
(r242339)
+++ stable/9/sys/dev/sound/pci/emu10kx.c Tue Oct 30 04:06:12 2012
(r242340)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
