svn commit: r193871 - in head/sys: kern sys

[Warner Losh]

Author: imp
Date: Tue Jun  9 23:24:04 2009
New Revision: 193871
URL: http://svn.freebsd.org/changeset/base/193871

Log:
  As discussed on arch@, restire
  devclass_{add,delete,find,quiesce}_driver.  They aren't needed or used
  and complicate locking newbus.

Modified:
  head/sys/kern/subr_bus.c
  head/sys/sys/bus.h

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Tue Jun  9 23:04:43 2009	(r193870)
+++ head/sys/kern/subr_bus.c	Tue Jun  9 23:24:04 2009	(r193871)
@@ -999,7 +999,7 @@ devclass_driver_added(devclass_t dc, dri
  * @param dc		the devclass to edit
  * @param driver	the driver to register
  */
-int
+static int
 devclass_add_driver(devclass_t dc, driver_t *driver, int pass)
 {
 	driverlink_t dl;
@@ -1052,7 +1052,7 @@ devclass_add_driver(devclass_t dc, drive
  * @param dc		the devclass to edit
  * @param driver	the driver to unregister
  */
-int
+static int
 devclass_delete_driver(devclass_t busclass, driver_t *driver)
 {
 	devclass_t dc = devclass_find(driver->name);
@@ -1127,7 +1127,7 @@ devclass_delete_driver(devclass_t buscla
  * @param dc		the devclass to edit
  * @param driver	the driver to unregister
  */
-int
+static int
 devclass_quiesce_driver(devclass_t busclass, driver_t *driver)
 {
 	devclass_t dc = devclass_find(driver->name);
@@ -1208,7 +1208,7 @@ devclass_find_driver_internal(devclass_t
  * @param dc		the devclass to search
  * @param classname	the driver name to search for
  */
-kobj_class_t
+static kobj_class_t
 devclass_find_driver(devclass_t dc, const char *classname)
 {
 	driverlink_t dl;

Modified: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h	Tue Jun  9 23:04:43 2009	(r193870)
+++ head/sys/sys/bus.h	Tue Jun  9 23:24:04 2009	(r193871)
@@ -435,11 +435,8 @@ void	device_verbose(device_t dev);
 /*
  * Access functions for devclass.
  */
-int	devclass_add_driver(devclass_t dc, kobj_class_t driver, int pass);
-int	devclass_delete_driver(devclass_t dc, kobj_class_t driver);
 devclass_t	devclass_create(const char *classname);
 devclass_t	devclass_find(const char *classname);
-kobj_class_t	devclass_find_driver(devclass_t dc, const char *classname);
 const char	*devclass_get_name(devclass_t dc);
 device_t	devclass_get_device(devclass_t dc, int unit);
 void	*devclass_get_softc(devclass_t dc, int unit);
@@ -452,7 +449,6 @@ void	devclass_set_parent(devclass_t dc, 
 devclass_t	devclass_get_parent(devclass_t dc);
 struct sysctl_ctx_list *devclass_get_sysctl_ctx(devclass_t dc);
 struct sysctl_oid *devclass_get_sysctl_tree(devclass_t dc);
-int	devclass_quiesce_driver(devclass_t dc, kobj_class_t driver);
 
 /*
  * Access functions for device resources.