Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758130Ab2K0HLT (ORCPT ); Tue, 27 Nov 2012 02:11:19 -0500 Received: from mailout39.mail01.mtsvc.net ([216.70.64.83]:48281 "EHLO n12.mail01.mtsvc.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758039Ab2K0HLS (ORCPT ); Tue, 27 Nov 2012 02:11:18 -0500 Message-ID: <1354000267.3284.4.camel@thor> Subject: [PATCH -next] staging/fwserial: Fix build breakage when !CONFIG_BUG From: Peter Hurley To: Stephen Rothwell Cc: Randy Dunlap , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "devel@driverdev.osuosl.org" , Andrew Morton Date: Tue, 27 Nov 2012 02:11:07 -0500 In-Reply-To: <50B3D767.70604@infradead.org> References: <20121127011738.9ecd7971a7ea2e3d09a9450d@canb.auug.org.au> <50B3D767.70604@infradead.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.2.4-0build1 Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-Authenticated-User: 125194 peter@hurleysoftware.com X-MT-ID: 8fa290c2a27252aacf65dbc4a42f3ce3735fb2a4 X-MT-INTERNAL-ID: 8fa290c2a27252aacf65dbc4a42f3ce3735fb2a4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 913 Lines: 33 Use WARN() as intended. Signed-off-by: Peter Hurley --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/