[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 1b9493a..02ad83d 100644 --- a/drivers/atm/atmtcp.c +++ b/drivers/atm/atmtcp.c
@@ -352,7 +352,7 @@ .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 ccba24f..876b77f 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c
@@ -702,7 +702,7 @@ .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 6d63afa..4dc5f2b 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c
@@ -630,7 +630,7 @@ .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 813e08d..7c85aa5 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c
@@ -737,7 +737,7 @@ .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 31d98b5..d14baaf 100644 --- a/net/atm/signaling.c +++ b/net/atm/signaling.c
@@ -256,7 +256,7 @@ .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 6d235b3..e18e249 100644 --- 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 6ed763e..13b7160 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c
@@ -125,7 +125,7 @@ }; 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)