From owner-svn-src-all@FreeBSD.ORG  Fri Mar  5 03:37:42 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 B197A106564A;
	Fri,  5 Mar 2010 03:37:42 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A0C1B8FC13;
	Fri,  5 Mar 2010 03:37:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o253bgef077104;
	Fri, 5 Mar 2010 03:37:42 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o253bgnp077102;
	Fri, 5 Mar 2010 03:37:42 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <201003050337.o253bgnp077102@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Fri, 5 Mar 2010 03:37:42 +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: r204748 - head/sys/dev/ispfw
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Mar 2010 03:37:42 -0000

Author: sobomax
Date: Fri Mar  5 03:37:42 2010
New Revision: 204748
URL: http://svn.freebsd.org/changeset/base/204748

Log:
  Don't spam dmesg with "registered firmware ..." when module is compiled
  into kernel, unless there is a verbose boot flag set.  There is no real
  need to have this information printed.
  
  MFC after:	1 week

Modified:
  head/sys/dev/ispfw/ispfw.c

Modified: head/sys/dev/ispfw/ispfw.c
==============================================================================
--- head/sys/dev/ispfw/ispfw.c	Fri Mar  5 02:52:23 2010	(r204747)
+++ head/sys/dev/ispfw/ispfw.c	Fri Mar  5 03:37:42 2010	(r204748)
@@ -142,6 +142,13 @@ static int	isp_2500_multi_loaded;
 #endif
 
 #define	ISPFW_VERSION	1
+
+#if	!defined(KLD_MODULE)
+#define	ISPFW_KLD	0
+#else
+#define	ISPFW_KLD	1
+#endif
+
 #define	RMACRO(token)	do {						\
 	if (token##_loaded)						\
 		break;							\
@@ -153,7 +160,9 @@ static int	isp_2500_multi_loaded;
 		break;							\
 	}								\
 	token##_loaded++;						\
-	printf("%s: registered firmware <%s>\n", MODULE_NAME, #token);	\
+	if (bootverbose || ISPFW_KLD)					\
+		printf("%s: registered firmware <%s>\n", MODULE_NAME, 	\
+		    #token);						\
 } while (0)
 
 #define	UMACRO(token)	do {						\
@@ -165,7 +174,9 @@ static int	isp_2500_multi_loaded;
 		break;							\
 	}								\
 	token##_loaded--;						\
-	printf("%s: unregistered firmware <%s>\n", MODULE_NAME, #token);\
+	if (bootverbose || ISPFW_KLD)					\
+		printf("%s: unregistered firmware <%s>\n", MODULE_NAME,	\
+		    #token);						\
 } while (0)
 
 static void