From: Inaky Perez-Gonzalez Date: Thu, 8 Jan 2009 19:06:48 +0000 (-0800) Subject: wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning X-Git-Tag: v2.6.29-rc1~45^2~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d48e470f76887d0befe025049158aeb6c1219d71;p=linux-2.6-omap-h63xx.git wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning 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 Signed-off-by: David S. Miller --- diff --git a/net/wimax/id-table.c b/net/wimax/id-table.c index d3b88558682..5e685f7eda9 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",