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>

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>
Inaky Perez-Gonzalez · David S. Miller
1 parent 7f46b1343f
Showing 1 changed file with 5 additions and 3 deletions Side-by-side Diff
net/wimax/id-table.c
@@ -123,15 +123,17 @@
 /*
  * 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",
...	...	@@ -123,15 +123,17 @@
123	123	/*
124	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	130	void wimax_id_table_release(void)
129	131	{
	132	+ struct wimax_dev *wimax_dev;
	133	+
130	134	#ifndef CONFIG_BUG
131	135	return;
132	136	#endif
133		- struct wimax_dev *wimax_dev;
134		-
135	137	spin_lock(&wimax_id_table_lock);
136	138	list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) {
137	139	printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n",