From 210ed4b32d3c6e94bec92286d343fd9d48c21f43 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 21 Jun 2006 17:48:59 +0000 Subject: Whoops, revert accidental commit. --- sys/kern/subr_bus.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'sys/kern/subr_bus.c') diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index a09f187..44dcd47 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -826,19 +826,6 @@ devclass_find(const char *classname) return (devclass_find_internal(classname, 0, FALSE)); } -/* - * Call BUS_DRIVER_ADDED for any existing busses in this class. - */ -static void -devclass_driver_added(devclass_t dc, driver_t *driver) -{ - int i; - - for (i = 0; i < dc->maxunit; i++) - if (dc->devices[i]) - BUS_DRIVER_ADDED(dc->devices[i], driver); -} - /** * @brief Add a device driver to a device class * @@ -854,6 +841,7 @@ int devclass_add_driver(devclass_t dc, driver_t *driver) { driverlink_t dl; + int i; PDEBUG(("%s", DRIVERNAME(driver))); @@ -878,7 +866,12 @@ devclass_add_driver(devclass_t dc, driver_t *driver) TAILQ_INSERT_TAIL(&dc->drivers, dl, link); driver->refs++; /* XXX: kobj_mtx */ - devclass_driver_added(dc, driver); + /* + * Call BUS_DRIVER_ADDED for any existing busses in this class. + */ + for (i = 0; i < dc->maxunit; i++) + if (dc->devices[i]) + BUS_DRIVER_ADDED(dc->devices[i], driver); bus_data_generation_update(); return (0); @@ -3761,11 +3754,6 @@ driver_module_handler(module_t mod, int what, void *arg) break; /* - * XXX: Need to find all the device classes whose parent - * is bus_devclass. Not only that, it has to be recursive. - */ - - /* * If the driver has any base classes, make the * devclass inherit from the devclass of the driver's * first base class. This will allow the system to -- cgit v1.1