From a1748b73285a140ab43af83a6ce10826920d9f1c Mon Sep 17 00:00:00 2001
From: Peter Hurley <peter@hurleysoftware.com>
Date: Tue, 27 Nov 2012 09:30:45 -0500
Subject: [PATCH] --- yaml --- r: 338475 b: refs/heads/master c:
 eef6e7b286e6dcf39a9b8c1d31477ee489451a8a h: refs/heads/master i:   338473:
 33a56fa0d1bf707467444dd895a3c1b96570bfc6   338471:
 d2d84099781c6eb37398ed3d12c5638c48935a63 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/fwserial/dma_fifo.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7baea9a348bb..c5243ba49189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7355ba3445f2a741bfb9f03c7c8d5fc3e10bf63f
+refs/heads/master: eef6e7b286e6dcf39a9b8c1d31477ee489451a8a
diff --git a/trunk/drivers/staging/fwserial/dma_fifo.c b/trunk/drivers/staging/fwserial/dma_fifo.c
index 72aa0533f018..5e8463445504 100644
--- a/trunk/drivers/staging/fwserial/dma_fifo.c
+++ b/trunk/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);					\
 })
 
 /*