Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755779AbZAHGSP (ORCPT ); Thu, 8 Jan 2009 01:18:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754326AbZAHGR1 (ORCPT ); Thu, 8 Jan 2009 01:17:27 -0500 Received: from 076-076-148-181.pdx.net ([76.76.148.181]:35214 "EHLO gocho" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753899AbZAHGR0 (ORCPT ); Thu, 8 Jan 2009 01:17:26 -0500 X-Greylist: delayed 46703 seconds by postgrey-1.27 at vger.kernel.org; Thu, 08 Jan 2009 01:17:21 EST From: Inaky Perez-Gonzalez To: netdev@vger.kernel.org Cc: wimax@linuxwimax.org, greg@kroah.com, Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, LKML , linux-wimax@intel.com Subject: [PATCH 1/3] wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning Date: Wed, 7 Jan 2009 09:18:45 -0800 Message-Id: <7e92a3e498e02567876f901eba29c59c294a417b.1231348339.git.inaky@linux.intel.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1815 Lines: 55 Reported by Randy Dunlap: > Also, this warning needs to be fixed: > > linux-next-20090106/net/wimax/id-table.c:133: warning: ISO C90 > forbids mixed declarations and code Move the return on #defined(CONFIG_BUG) below the variable declarations so it doesn't violate ISO C90. On wimax_id_table_release() we want to do a debug check if CONFIG_BUG is enabled. However, we also want the debug code to be always compiled to ensure there is no bitrot. It will be optimized out by the compiler when CONFIG_BUG is disabled. Added a note to the function header stating this. Signed-off-by: Inaky Perez-Gonzalez --- net/wimax/id-table.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/net/wimax/id-table.c b/net/wimax/id-table.c index d3b8855..5e685f7 100644 --- a/net/wimax/id-table.c +++ b/net/wimax/id-table.c @@ -123,15 +123,17 @@ void wimax_id_table_rm(struct wimax_dev *wimax_dev) /* * Release the gennetlink family id / mapping table * - * On debug, verify that the table is empty upon removal. + * On debug, verify that the table is empty upon removal. We want the + * code always compiled, to ensure it doesn't bit rot. It will be + * compiled out if CONFIG_BUG is disabled. */ void wimax_id_table_release(void) { + struct wimax_dev *wimax_dev; + #ifndef CONFIG_BUG return; #endif - struct wimax_dev *wimax_dev; - spin_lock(&wimax_id_table_lock); list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) { printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n", -- 1.5.6.5 -- 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/