From owner-svn-src-stable@FreeBSD.ORG  Sun Mar 22 15:46:12 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C024B10656C3;
	Sun, 22 Mar 2009 15:46:12 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD8318FC12;
	Sun, 22 Mar 2009 15:46:12 +0000 (UTC)
	(envelope-from n_hibma@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 n2MFkCt9072599;
	Sun, 22 Mar 2009 15:46:12 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2MFkCDv072598;
	Sun, 22 Mar 2009 15:46:12 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <200903221546.n2MFkCDv072598@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Sun, 22 Mar 2009 15:46:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190267 - stable/7/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2009 15:46:13 -0000

Author: n_hibma
Date: Sun Mar 22 15:46:12 2009
New Revision: 190267
URL: http://svn.freebsd.org/changeset/base/190267

Log:
  If the device marked itself quiet, make detachment quiet as well. This
  avoids '<dev>XX: detached' messages when the 'attached' message was
  suppressed.

Modified:
  stable/7/sys/kern/subr_bus.c

Modified: stable/7/sys/kern/subr_bus.c
==============================================================================
--- stable/7/sys/kern/subr_bus.c	Sun Mar 22 15:29:12 2009	(r190266)
+++ stable/7/sys/kern/subr_bus.c	Sun Mar 22 15:46:12 2009	(r190267)
@@ -2444,7 +2444,8 @@ device_detach(device_t dev)
 	if ((error = DEVICE_DETACH(dev)) != 0)
 		return (error);
 	devremoved(dev);
-	device_printf(dev, "detached\n");
+	if (!device_is_quiet(dev))
+		device_printf(dev, "detached\n");
 	if (dev->parent)
 		BUS_CHILD_DETACHED(dev->parent, dev);