From owner-svn-src-all@FreeBSD.ORG Tue Jun 9 23:24:05 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 654D9106566C; Tue, 9 Jun 2009 23:24:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3980F8FC1A; Tue, 9 Jun 2009 23:24:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59NO4A1087165; Tue, 9 Jun 2009 23:24:04 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59NO4Lt087163; Tue, 9 Jun 2009 23:24:04 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200906092324.n59NO4Lt087163@svn.freebsd.org> From: Warner Losh Date: Tue, 9 Jun 2009 23:24:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193871 - in head/sys: kern sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 23:24:05 -0000 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.