Skip to content

Commit

Permalink
wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Inaky Perez-Gonzalez authored and davem330 committed Jan 8, 2009
1 parent 7f46b13 commit d48e470
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/wimax/id-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit d48e470

Please sign in to comment.