diff options
author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-01-08 14:06:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:06:48 -0500 |
commit | d48e470f76887d0befe025049158aeb6c1219d71 (patch) | |
tree | a171e62813e59d4d800c7dec0a3fce36960bd2be | |
parent | 7f46b1343f723f98634a5dcee47856b2000079ed (diff) |
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>
-rw-r--r-- | 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 d3b88558682c..5e685f7eda90 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) | |||
123 | /* | 123 | /* |
124 | * Release the gennetlink family id / mapping table | 124 | * Release the gennetlink family id / mapping table |
125 | * | 125 | * |
126 | * On debug, verify that the table is empty upon removal. | 126 | * On debug, verify that the table is empty upon removal. We want the |
127 | * code always compiled, to ensure it doesn't bit rot. It will be | ||
128 | * compiled out if CONFIG_BUG is disabled. | ||
127 | */ | 129 | */ |
128 | void wimax_id_table_release(void) | 130 | void wimax_id_table_release(void) |
129 | { | 131 | { |
132 | struct wimax_dev *wimax_dev; | ||
133 | |||
130 | #ifndef CONFIG_BUG | 134 | #ifndef CONFIG_BUG |
131 | return; | 135 | return; |
132 | #endif | 136 | #endif |
133 | struct wimax_dev *wimax_dev; | ||
134 | |||
135 | spin_lock(&wimax_id_table_lock); | 137 | spin_lock(&wimax_id_table_lock); |
136 | list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) { | 138 | list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) { |
137 | printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n", | 139 | printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n", |