Skip to contentSkip to conversation

Kill unused variables in the net code

PATCH In review Geert Uytterhoeven 3 participants 4 messages Jan 7, 2005 Locking primitives

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Kill unused variables in the net code

2.4.28-rc2 introduced a warning in the net code on non-SMP:

net/core/neighbour.c:1809: warning: unused variable `tbl'

The following patch fixes this.

include/linux/spinlock.h +1 -1
@@ -147,7 +147,7 @@
 
 #define rwlock_init(lock)	do { } while(0)
 #define read_lock(lock)		(void)(lock) /* Not "unused variable". */
-#define read_unlock(lock)	do { } while(0)
+#define read_unlock(lock)	(void)(lock) /* Not "unused variable". */
 #define write_lock(lock)	(void)(lock) /* Not "unused variable". */
 #define write_unlock(lock)	do { } while(0)
 

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#1 lore raw
Quoted 20 lines · Geert Uytterhoeven

2.4.28-rc2 introduced a warning in the net code on non-SMP:

net/core/neighbour.c:1809: warning: unused variable `tbl'

The following patch fixes this.

include/linux/spinlock.h +1 -1
@@ -147,7 +147,7 @@
 
 #define rwlock_init(lock)	do { } while(0)
 #define read_lock(lock)	(void)(lock) /* Not "unused variable". */
-#define read_unlock(lock)	do { } while(0)
+#define read_unlock(lock)	(void)(lock) /* Not "unused variable". */
 #define write_lock(lock)	(void)(lock) /* Not "unused variable". */
 #define write_unlock(lock)	do { } while(0)
 
Quoted 3 lines

Gr{oetje,eeting}s,

Geert

But don't all you need to do is:

#define read_unlock(x)

Cheers,
Dick Johnson
Penguin : Linux version 2.6.10 on an i686 machine (5537.79 BogoMips).
Notice : All mail here is now cached for review by Dictator Bush.
98.36% of all statistics are fiction.

#2 lore raw
Quoted 23 lines · linux-os
Quoted 13 lines · Geert Uytterhoeven

2.4.28-rc2 introduced a warning in the net code on non-SMP:

net/core/neighbour.c:1809: warning: unused variable `tbl'

The following patch fixes this.

--- linux-2.4.29-rc1/include/linux/spinlock.h 2004-04-27 17:22:10.000000000
+0200
+++ linux-m68k-2.4.29-rc1/include/linux/spinlock.h 2005-01-07
21:51:28.000000000 +0100

include/linux/spinlock.h line 152

Quoted 7 lines
include/linux/spinlock.h +1 -1
@@ -147,7 +147,7 @@
 
 #define rwlock_init(lock)	do { } while(0)
 #define read_lock(lock)	(void)(lock) /* Not "unused variable". */
-#define read_unlock(lock)	do { } while(0)
+#define read_unlock(lock)	(void)(lock) /* Not "unused variable". */
 #define write_lock(lock)	(void)(lock) /* Not "unused variable". */
 #define write_unlock(lock)	do { } while(0)

But don't all you need to do is:

Quoted 1 line

#define read_unlock(x)

No, since the `x' may refer to a variable that's further unused (cfr. net/core/neighbour.c:1809).

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw
In reply to linux-os
Quoted 6 lines · linux-os

include/linux/spinlock.h line 150

Quoted 2 lines
include/linux/spinlock.h +1 -1
-#define read_unlock(lock)	do { } while(0)
+#define read_unlock(lock)	(void)(lock) /* Not "unused variable". */

But don't all you need to do is:

#define read_unlock(x)

Then tbl will still be unused - and compiler will emit warning.

Sam