summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky@linux.intel.com>2009-01-08 11:06:48 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-08 11:06:48 -0800
commitd48e470f76887d0befe025049158aeb6c1219d71 (patch)
treea171e62813e59d4d800c7dec0a3fce36960bd2be /net
parent7f46b1343f723f98634a5dcee47856b2000079ed (diff)
downloadlinux-3.10-d48e470f76887d0befe025049158aeb6c1219d71.tar.gz
linux-3.10-d48e470f76887d0befe025049158aeb6c1219d71.tar.bz2
linux-3.10-d48e470f76887d0befe025049158aeb6c1219d71.zip
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 <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/wimax/id-table.c8
1 files changed, 5 insertions, 3 deletions
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",