[PATCH 1/5] Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED

[PATCH 1/5] Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED

[Jiri Slaby]

ibm_newemac, remove SPIN_LOCK_UNLOCKED

SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>

---
commit aefcf0f6b6ab925184e7cebff8b609e4da1f5c0d
tree 9e1e6240f26c759826959e8812885726c520019d
parent f87566db6dd9613dde8de59380cd2f423166511e
author Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:54:41 +0200
committer Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:54:41 +0200

 drivers/net/ibm_newemac/debug.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ibm_newemac/debug.c
index 170524e..ada13cd 100644
--- a/drivers/net/ibm_newemac/debug.c
+++ b/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)
 {

[PATCH 2/5] Watchdog: bfin_wdt, remove SPIN_LOCK_UNLOCKED

[Jiri Slaby]

bfin_wdt, remove SPIN_LOCK_UNLOCKED

SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Wim Van Sebroeck <wim@iguana.be>

---
commit 5290a0e1fffeb61f0062ebca98e45a6a5ba75711
tree 4d377ca30153b48b32b4d2c079ab884983c0091d
parent aefcf0f6b6ab925184e7cebff8b609e4da1f5c0d
author Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:55:29 +0200
committer Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:55:29 +0200

 drivers/watchdog/bfin_wdt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 309d279..31dc7a6 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -71,7 +71,7 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 static struct watchdog_info bfin_wdt_info;
 static unsigned long open_check;
 static char expect_close;
-static spinlock_t bfin_wdt_spinlock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(bfin_wdt_spinlock);
 
 /**
  *	bfin_wdt_keepalive - Keep the Userspace Watchdog Alive

[PATCH 3/5] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED

[Jiri Slaby]

cpwatchdog, remove SPIN_LOCK_UNLOCKED

SPIN_LOCK_UNLOCKED is deprecated, use __SPIN_LOCK_UNLOCKED with an unique
name instead

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Wim Van Sebroeck <wim@iguana.be>

---
commit 4e91ba06c53856bfaab065aaf9fd8f5b0dd59f6f
tree ff123ed71958d9331623876dfc20efa86c639498
parent 5290a0e1fffeb61f0062ebca98e45a6a5ba75711
author Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:56:54 +0200
committer Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:56:54 +0200

 drivers/sbus/char/cpwatchdog.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 7b5773d..a4e7581 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -154,7 +154,7 @@ struct wd_device {
 };
 
 static struct wd_device wd_dev = { 
-		0, SPIN_LOCK_UNLOCKED, 0, 0, 0, 0,
+		0, __SPIN_LOCK_UNLOCKED(wd_dev.lock), 0, 0, 0, 0,
 };
 
 static struct timer_list wd_timer;

[PATCH 4/5] FS: sysfs, remove SPIN_LOCK_UNLOCKED

[Jiri Slaby]

sysfs, remove SPIN_LOCK_UNLOCKED

SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>

---
commit 828042d12cc0aa515e049889aa76d4066df100c0
tree 85652493f11a06d0a1cda316d0f88a2ee7117d50
parent 4e91ba06c53856bfaab065aaf9fd8f5b0dd59f6f
author Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:58:48 +0200
committer Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 11:58:48 +0200

 fs/sysfs/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 6d31ac6..cb7eadf 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -37,7 +37,7 @@ void sysfs_printk_last_file(void)
  * sysfs_dirent->s_attr.open points to sysfs_open_dirent.  s_attr.open
  * is protected by sysfs_open_dirent_lock.
  */
-static spinlock_t sysfs_open_dirent_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
 
 struct sysfs_open_dirent {
 	atomic_t		refcnt;

[PATCH 5/5] Net: sunrpc, remove SPIN_LOCK_UNLOCKED

[Jiri Slaby]

sunrpc, remove SPIN_LOCK_UNLOCKED

SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit d5e782e62a4fe2663a012571c3444445d9887b02
tree b993038b020d8c619f6ffdad412fbb992c073513
parent 828042d12cc0aa515e049889aa76d4066df100c0
author Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 12:00:13 +0200
committer Jiri Slaby <jirislaby@gmail.com> Thu, 25 Oct 2007 12:00:13 +0200

 net/sunrpc/xprt.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 282a9a2..cd641c8 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -62,7 +62,7 @@ static inline void	do_xprt_reserve(struct rpc_task *);
 static void	xprt_connect_status(struct rpc_task *task);
 static int      __xprt_get_cong(struct rpc_xprt *, struct rpc_task *);
 
-static spinlock_t xprt_list_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(xprt_list_lock);
 static LIST_HEAD(xprt_list);
 
 /*

Re: [PATCH 2/5] Watchdog: bfin_wdt, remove SPIN_LOCK_UNLOCKED

[Mike Frysinger]

On Nov 9, 2007 6:32 PM, Jiri Slaby <jirislaby@gmail.com> wrote:
> bfin_wdt, remove SPIN_LOCK_UNLOCKED
>
> SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

thanks

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
-mike

Re: [PATCH 2/5] Watchdog: bfin_wdt, remove SPIN_LOCK_UNLOCKED

[Wim Van Sebroeck]

Hi All,

> bfin_wdt, remove SPIN_LOCK_UNLOCKED
> 
> SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead

Added to linux-2.6-watchdog-mm git tree.

Greetings,
Wim.

Re: [PATCH 3/5] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED

[Wim Van Sebroeck]

Hi All,

> cpwatchdog, remove SPIN_LOCK_UNLOCKED
> 
> SPIN_LOCK_UNLOCKED is deprecated, use __SPIN_LOCK_UNLOCKED with an unique
> name instead

Added to linux-2.6-watchdog-mm git tree.

Greetings,
Wim.