[NET]: SPIN_LOCK_UNLOCKED cleanup in drivers/atm, net

SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead

Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 1b9493a16aca00a1487c497d2883d09cdea0e372..02ad83d6b562b6e0d14142a126622b26c7e9f180 100644 (file)
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -352,7 +352,7 @@ static struct atm_dev atmtcp_control_dev = {
        .ops            = &atmtcp_c_dev_ops,
        .type           = "atmtcp",
        .number         = 999,
-       .lock           = SPIN_LOCK_UNLOCKED
+       .lock           = __SPIN_LOCK_UNLOCKED(atmtcp_control_dev.lock)
 };
 
 

diff --git a/net/atm/clip.c b/net/atm/clip.c
index ccba24ffb96621382625c9464c807174328cd5fc..876b77f1474521b8e9a77a425cac5e7e53edb2cb 100644 (file)
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -702,7 +702,7 @@ static struct atm_dev atmarpd_dev = {
        .ops =                  &atmarpd_dev_ops,
        .type =                 "arpd",
        .number =               999,
-       .lock =                 SPIN_LOCK_UNLOCKED
+       .lock =                 __SPIN_LOCK_UNLOCKED(atmarpd_dev.lock)
 };
 
 

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 6d63afa5764d8f26462854852ad635f6def2794e..4dc5f2b8c43c23631fe06f45c49ffd2e84a5d786 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -630,7 +630,7 @@ static struct atm_dev lecatm_dev = {
        .ops = &lecdev_ops,
        .type = "lec",
        .number = 999,          /* dummy device number */
-       .lock = SPIN_LOCK_UNLOCKED
+       .lock = __SPIN_LOCK_UNLOCKED(lecatm_dev.lock)
 };
 
 /*

diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 813e08d6dc7c3dc499533ebfcf8743156ddc6322..7c85aa551d5e98977e7e9f91a0a6949f31bf9544 100644 (file)
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -737,7 +737,7 @@ static struct atm_dev mpc_dev = {
        .ops    = &mpc_ops,
        .type   = "mpc",
        .number = 42,
-       .lock   = SPIN_LOCK_UNLOCKED
+       .lock   = __SPIN_LOCK_UNLOCKED(mpc_dev.lock)
        /* members not explicitly initialised will be 0 */
 };
 

diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 31d98b57e1deafdea9f6b91054313f21e1408c6b..d14baaf1f4c32cda834d8227982331c81c61eed0 100644 (file)
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -256,7 +256,7 @@ static struct atm_dev sigd_dev = {
        .ops =          &sigd_dev_ops,
        .type =         "sig",
        .number =       999,
-       .lock =         SPIN_LOCK_UNLOCKED
+       .lock =         __SPIN_LOCK_UNLOCKED(sigd_dev.lock)
 };
 
 

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 6d235b3013dd3262b8185fa61e06690bad6eccc9..e18e249ac49b5974ed7bc9d6f788988e78fb1ea8 100644 (file)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -27,7 +27,7 @@
 struct inet_timewait_death_row dccp_death_row = {
        .sysctl_max_tw_buckets = NR_FILE * 2,
        .period         = DCCP_TIMEWAIT_LEN / INET_TWDR_TWKILL_SLOTS,
-       .death_lock     = SPIN_LOCK_UNLOCKED,
+       .death_lock     = __SPIN_LOCK_UNLOCKED(dccp_death_row.death_lock),
        .hashinfo       = &dccp_hashinfo,
        .tw_timer       = TIMER_INITIALIZER(inet_twdr_hangman, 0,
                                            (unsigned long)&dccp_death_row),

diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index 6ed763ee6785ac7bd5db2f3d3b8587a58b19feff..13b7160fb8927b77b30bd6826f295169c71154e8 100644 (file)
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -125,7 +125,7 @@ struct mip6_report_rate_limiter {
 };
 
 static struct mip6_report_rate_limiter mip6_report_rl = {
-       .lock = SPIN_LOCK_UNLOCKED
+       .lock = __SPIN_LOCK_UNLOCKED(mip6_report_rl.lock)
 };
 
 static int mip6_destopt_input(struct xfrm_state *x, struct sk_buff *skb)