Browse Source

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>
imx_3.10.17_1.0.0_ga
Inaky Perez-Gonzalez 12 years ago
committed by David S. Miller
parent
commit
d48e470f76
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      net/wimax/id-table.c

+ 5
- 3
net/wimax/id-table.c View File

@ -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",


Loading…
Cancel
Save