Skip to contentSkip to conversation

Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED

PATCH Applied [email protected] 2 participants 2 messages Dec 14, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 6/10 Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED

From: Jiri Slaby <[email protected]>

SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Signed-off-by Jiri Slaby <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/net/ibm_newemac/debug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ibm_newemac/debug.c renamed from drivers/net/ibm_newemac/debug.c~net-ibm_newemac-remove-spin_lock_unlocked +1 -1
diff -puN drivers/net/ibm_newemac/debug.c~net-ibm_newemac-remove-spin_lock_unlocked drivers/net/ibm_newemac/debug.c
@@ -21,7 +21,7 @@
 
 #include "core.h"
 
-static spinlock_t emac_dbg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(emac_dbg_lock);
 
 static void emac_desc_dump(struct emac_instance *p)
 {

_

#1 lore raw
Quoted 16 lines · [email protected] wrote:

From: Jiri Slaby <[email protected]>

SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Signed-off-by Jiri Slaby <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/net/ibm_newemac/debug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/net/ibm_newemac/debug.c~net-ibm_newemac-remove-spin_lock_unlocked drivers/net/ibm_newemac/debug.c

drivers/net/ibm_newemac/debug.c line 25

Quoted 6 lines
drivers/net/ibm_newemac/debug.c renamed from drivers/net/ibm_newemac/debug.c~net-ibm_newemac-remove-spin_lock_unlocked +1 -1
@@ -21,7 +21,7 @@
 
 #include "core.h"
 
-static spinlock_t emac_dbg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(emac_dbg_lock);

applied #upstream-fixes