linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Hurley <peter@hurleysoftware.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH -next] staging/fwserial: Fix build breakage when !CONFIG_BUG
Date: Tue, 27 Nov 2012 02:11:07 -0500	[thread overview]
Message-ID: <1354000267.3284.4.camel@thor> (raw)
In-Reply-To: <50B3D767.70604@infradead.org>

Use WARN() as intended.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/staging/fwserial/dma_fifo.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/fwserial/dma_fifo.c b/drivers/staging/fwserial/dma_fifo.c
index 72aa053..5e84634 100644
--- a/drivers/staging/fwserial/dma_fifo.c
+++ b/drivers/staging/fwserial/dma_fifo.c
@@ -33,10 +33,7 @@
 
 #define FAIL(fifo, condition, format...) ({				\
 	fifo->corrupt = !!(condition);					\
-	if (unlikely(fifo->corrupt)) {					\
-		__WARN_printf(format);					\
-	}								\
-	unlikely(fifo->corrupt);					\
+	WARN(fifo->corrupt, format);					\
 })
 
 /*
-- 
1.8.0

  parent reply	other threads:[~2012-11-27  7:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-26 14:17 linux-next: Tree for Nov 26 Stephen Rothwell
2012-11-26 19:07 ` [PATCH -next] tty/serial: fix ifx6x60.c declaration warning Randy Dunlap
2012-11-26 19:43 ` linux-next: Tree for Nov 26 (mmc/host/tifm_sd.c) Randy Dunlap
2012-11-26 20:56 ` linux-next: Tree for Nov 26 (staging/fwserial) Randy Dunlap
2012-11-26 23:20   ` Andrew Morton
2012-11-27  7:39     ` Peter Hurley
2012-11-27  7:11   ` Peter Hurley [this message]
2012-11-27 18:42     ` [PATCH -next] staging/fwserial: Fix build breakage when !CONFIG_BUG Randy Dunlap
2012-11-28  0:56       ` Peter Hurley
2012-11-27  7:17   ` linux-next: Tree for Nov 26 (staging/fwserial) Peter Hurley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354000267.3284.4.camel@thor \
    --to=peter@hurleysoftware.com \
    --cc=akpm@linux-foundation.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).