From owner-svn-src-all@FreeBSD.ORG  Sun Nov 21 00:53:27 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 661F2106564A;
	Sun, 21 Nov 2010 00:53:27 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54BE58FC0C;
	Sun, 21 Nov 2010 00:53:27 +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 oAL0rRFU031689;
	Sun, 21 Nov 2010 00:53:27 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAL0rRD6031687;
	Sun, 21 Nov 2010 00:53:27 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201011210053.oAL0rRD6031687@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 21 Nov 2010 00:53:27 +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: r215603 - stable/7/sys/dev/mpt
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: Sun, 21 Nov 2010 00:53:27 -0000

Author: marius
Date: Sun Nov 21 00:53:27 2010
New Revision: 215603
URL: http://svn.freebsd.org/changeset/base/215603

Log:
  MFC: r215325
  
  Use the correct variable for determining the verbosity level in mpt_lprtc().
  While at it, fix the whitespace of that macro.
  
  PR:		149502
  Submitted by:	Andrew Boyer

Modified:
  stable/7/sys/dev/mpt/mpt.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mpt/mpt.h
==============================================================================
--- stable/7/sys/dev/mpt/mpt.h	Sun Nov 21 00:53:19 2010	(r215602)
+++ stable/7/sys/dev/mpt/mpt.h	Sun Nov 21 00:53:27 2010	(r215603)
@@ -1110,10 +1110,10 @@ do {						\
 		mpt_prt(mpt, __VA_ARGS__);	\
 } while (0)
 
-#define mpt_lprtc(mpt, level, ...)		 \
-do {						 \
-	if (level <= (mpt)->debug_level)	 \
-		mpt_prtc(mpt, __VA_ARGS__);	 \
+#define mpt_lprtc(mpt, level, ...)		\
+do {						\
+	if (level <= (mpt)->verbose)		\
+		mpt_prtc(mpt, __VA_ARGS__);	\
 } while (0)
 #else
 void mpt_lprt(struct mpt_softc *, int, const char *, ...)