aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilind Arun Choudhary <milindchoudhary@gmail.com>2007-05-06 17:50:54 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:59 -0400
commit241258d1cc4d3551608364cd678d5a85239ad481 (patch)
tree8489b00c837e01f22e84e1c7b310d3b255d9e5a1
parentedfe7a569687c2cd85e82eaecae5b260577accbb (diff)
SPIN_LOCK_UNLOCKED cleanup in arch/m68k
SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m68k/amiga/amiints.c2
-rw-r--r--arch/m68k/amiga/cia.c4
-rw-r--r--arch/m68k/apollo/dn_ints.c2
-rw-r--r--arch/m68k/atari/ataints.c2
-rw-r--r--arch/m68k/kernel/ints.c4
-rw-r--r--arch/m68k/mac/macints.c2
-rw-r--r--arch/m68k/q40/q40ints.c2
-rw-r--r--arch/m68k/sun3/sun3ints.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c
index 28d95cfe8ac0..907a5533c845 100644
--- a/arch/m68k/amiga/amiints.c
+++ b/arch/m68k/amiga/amiints.c
@@ -54,7 +54,7 @@ static irqreturn_t ami_int5(int irq, void *dev_id);
54 54
55static struct irq_controller amiga_irq_controller = { 55static struct irq_controller amiga_irq_controller = {
56 .name = "amiga", 56 .name = "amiga",
57 .lock = SPIN_LOCK_UNLOCKED, 57 .lock = __SPIN_LOCK_UNLOCKED(amiga_irq_controller.lock),
58 .enable = amiga_enable_irq, 58 .enable = amiga_enable_irq,
59 .disable = amiga_disable_irq, 59 .disable = amiga_disable_irq,
60}; 60};
diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c
index 7a20058eb380..c4a4ffd45bc0 100644
--- a/arch/m68k/amiga/cia.c
+++ b/arch/m68k/amiga/cia.c
@@ -123,7 +123,7 @@ static void cia_disable_irq(unsigned int irq)
123 123
124static struct irq_controller cia_irq_controller = { 124static struct irq_controller cia_irq_controller = {
125 .name = "cia", 125 .name = "cia",
126 .lock = SPIN_LOCK_UNLOCKED, 126 .lock = __SPIN_LOCK_UNLOCKED(cia_irq_controller.lock),
127 .enable = cia_enable_irq, 127 .enable = cia_enable_irq,
128 .disable = cia_disable_irq, 128 .disable = cia_disable_irq,
129}; 129};
@@ -160,7 +160,7 @@ static void auto_disable_irq(unsigned int irq)
160 160
161static struct irq_controller auto_irq_controller = { 161static struct irq_controller auto_irq_controller = {
162 .name = "auto", 162 .name = "auto",
163 .lock = SPIN_LOCK_UNLOCKED, 163 .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
164 .enable = auto_enable_irq, 164 .enable = auto_enable_irq,
165 .disable = auto_disable_irq, 165 .disable = auto_disable_irq,
166}; 166};
diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index 4274af125998..13bd41bed28e 100644
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -31,7 +31,7 @@ void apollo_irq_shutdown(unsigned int irq)
31 31
32static struct irq_controller apollo_irq_controller = { 32static struct irq_controller apollo_irq_controller = {
33 .name = "apollo", 33 .name = "apollo",
34 .lock = SPIN_LOCK_UNLOCKED, 34 .lock = __SPIN_LOCK_UNLOCKED(apollo_irq_controller.lock),
35 .startup = apollo_irq_startup, 35 .startup = apollo_irq_startup,
36 .shutdown = apollo_irq_shutdown, 36 .shutdown = apollo_irq_shutdown,
37}; 37};
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 7f812641790c..b85ca22024c1 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -339,7 +339,7 @@ static void atari_shutdown_irq(unsigned int irq)
339 339
340static struct irq_controller atari_irq_controller = { 340static struct irq_controller atari_irq_controller = {
341 .name = "atari", 341 .name = "atari",
342 .lock = SPIN_LOCK_UNLOCKED, 342 .lock = __SPIN_LOCK_UNLOCKED(atari_irq_controller.lock),
343 .startup = atari_startup_irq, 343 .startup = atari_startup_irq,
344 .shutdown = atari_shutdown_irq, 344 .shutdown = atari_shutdown_irq,
345 .enable = atari_enable_irq, 345 .enable = atari_enable_irq,
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index b66c97c904b3..60d4d75f5798 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -59,14 +59,14 @@ static int m68k_first_user_vec;
59 59
60static struct irq_controller auto_irq_controller = { 60static struct irq_controller auto_irq_controller = {
61 .name = "auto", 61 .name = "auto",
62 .lock = SPIN_LOCK_UNLOCKED, 62 .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
63 .startup = m68k_irq_startup, 63 .startup = m68k_irq_startup,
64 .shutdown = m68k_irq_shutdown, 64 .shutdown = m68k_irq_shutdown,
65}; 65};
66 66
67static struct irq_controller user_irq_controller = { 67static struct irq_controller user_irq_controller = {
68 .name = "user", 68 .name = "user",
69 .lock = SPIN_LOCK_UNLOCKED, 69 .lock = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
70 .startup = m68k_irq_startup, 70 .startup = m68k_irq_startup,
71 .shutdown = m68k_irq_shutdown, 71 .shutdown = m68k_irq_shutdown,
72}; 72};
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index f6fcd754d8f6..0fc72d8f786e 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -219,7 +219,7 @@ static void mac_disable_irq(unsigned int irq);
219 219
220static struct irq_controller mac_irq_controller = { 220static struct irq_controller mac_irq_controller = {
221 .name = "mac", 221 .name = "mac",
222 .lock = SPIN_LOCK_UNLOCKED, 222 .lock = __SPIN_LOCK_UNLOCKED(mac_irq_controller.lock),
223 .enable = mac_enable_irq, 223 .enable = mac_enable_irq,
224 .disable = mac_disable_irq, 224 .disable = mac_disable_irq,
225}; 225};
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 31cc07d8cec4..2fb25ae46a8a 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -59,7 +59,7 @@ static void q40_irq_shutdown(unsigned int irq)
59 59
60static struct irq_controller q40_irq_controller = { 60static struct irq_controller q40_irq_controller = {
61 .name = "q40", 61 .name = "q40",
62 .lock = SPIN_LOCK_UNLOCKED, 62 .lock = __SPIN_LOCK_UNLOCKED(q40_irq_controller.lock),
63 .startup = q40_irq_startup, 63 .startup = q40_irq_startup,
64 .shutdown = q40_irq_shutdown, 64 .shutdown = q40_irq_shutdown,
65 .enable = q40_enable_irq, 65 .enable = q40_enable_irq,
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index 4232a2c2fae9..50df34bf80e3 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -90,7 +90,7 @@ static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
90 90
91static struct irq_controller sun3_irq_controller = { 91static struct irq_controller sun3_irq_controller = {
92 .name = "sun3", 92 .name = "sun3",
93 .lock = SPIN_LOCK_UNLOCKED, 93 .lock = __SPIN_LOCK_UNLOCKED(sun3_irq_controller.lock),
94 .startup = m68k_irq_startup, 94 .startup = m68k_irq_startup,
95 .shutdown = m68k_irq_shutdown, 95 .shutdown = m68k_irq_shutdown,
96 .enable = sun3_enable_irq, 96 .enable = sun3_enable_irq,