Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 241258d1cc4d3551608364cd678d5a85239ad481

Authored by Milind Arun Choudhary
Committed by Linus Torvalds
1 parent edfe7a5696
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 8 changed files with 10 additions and 10 deletions Side-by-side Diff

arch/m68k/amiga/amiints.c
Diff comments   View file @ 241258d
... ... @@ -54,7 +54,7 @@
54 54  
55 55 static struct irq_controller amiga_irq_controller = {
56 56 .name = "amiga",
57   - .lock = SPIN_LOCK_UNLOCKED,
  57 + .lock = __SPIN_LOCK_UNLOCKED(amiga_irq_controller.lock),
58 58 .enable = amiga_enable_irq,
59 59 .disable = amiga_disable_irq,
60 60 };
arch/m68k/amiga/cia.c
Diff comments   View file @ 241258d
... ... @@ -123,7 +123,7 @@
123 123  
124 124 static struct irq_controller cia_irq_controller = {
125 125 .name = "cia",
126   - .lock = SPIN_LOCK_UNLOCKED,
  126 + .lock = __SPIN_LOCK_UNLOCKED(cia_irq_controller.lock),
127 127 .enable = cia_enable_irq,
128 128 .disable = cia_disable_irq,
129 129 };
... ... @@ -160,7 +160,7 @@
160 160  
161 161 static struct irq_controller auto_irq_controller = {
162 162 .name = "auto",
163   - .lock = SPIN_LOCK_UNLOCKED,
  163 + .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
164 164 .enable = auto_enable_irq,
165 165 .disable = auto_disable_irq,
166 166 };
arch/m68k/apollo/dn_ints.c
Diff comments   View file @ 241258d
... ... @@ -31,7 +31,7 @@
31 31  
32 32 static struct irq_controller apollo_irq_controller = {
33 33 .name = "apollo",
34   - .lock = SPIN_LOCK_UNLOCKED,
  34 + .lock = __SPIN_LOCK_UNLOCKED(apollo_irq_controller.lock),
35 35 .startup = apollo_irq_startup,
36 36 .shutdown = apollo_irq_shutdown,
37 37 };
arch/m68k/atari/ataints.c
Diff comments   View file @ 241258d
... ... @@ -339,7 +339,7 @@
339 339  
340 340 static struct irq_controller atari_irq_controller = {
341 341 .name = "atari",
342   - .lock = SPIN_LOCK_UNLOCKED,
  342 + .lock = __SPIN_LOCK_UNLOCKED(atari_irq_controller.lock),
343 343 .startup = atari_startup_irq,
344 344 .shutdown = atari_shutdown_irq,
345 345 .enable = atari_enable_irq,
arch/m68k/kernel/ints.c
Diff comments   View file @ 241258d
... ... @@ -59,14 +59,14 @@
59 59  
60 60 static struct irq_controller auto_irq_controller = {
61 61 .name = "auto",
62   - .lock = SPIN_LOCK_UNLOCKED,
  62 + .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
63 63 .startup = m68k_irq_startup,
64 64 .shutdown = m68k_irq_shutdown,
65 65 };
66 66  
67 67 static struct irq_controller user_irq_controller = {
68 68 .name = "user",
69   - .lock = SPIN_LOCK_UNLOCKED,
  69 + .lock = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
70 70 .startup = m68k_irq_startup,
71 71 .shutdown = m68k_irq_shutdown,
72 72 };
arch/m68k/mac/macints.c
Diff comments   View file @ 241258d
... ... @@ -219,7 +219,7 @@
219 219  
220 220 static struct irq_controller mac_irq_controller = {
221 221 .name = "mac",
222   - .lock = SPIN_LOCK_UNLOCKED,
  222 + .lock = __SPIN_LOCK_UNLOCKED(mac_irq_controller.lock),
223 223 .enable = mac_enable_irq,
224 224 .disable = mac_disable_irq,
225 225 };
arch/m68k/q40/q40ints.c
Diff comments   View file @ 241258d
... ... @@ -59,7 +59,7 @@
59 59  
60 60 static struct irq_controller q40_irq_controller = {
61 61 .name = "q40",
62   - .lock = SPIN_LOCK_UNLOCKED,
  62 + .lock = __SPIN_LOCK_UNLOCKED(q40_irq_controller.lock),
63 63 .startup = q40_irq_startup,
64 64 .shutdown = q40_irq_shutdown,
65 65 .enable = q40_enable_irq,
arch/m68k/sun3/sun3ints.c
Diff comments   View file @ 241258d
... ... @@ -90,7 +90,7 @@
90 90  
91 91 static struct irq_controller sun3_irq_controller = {
92 92 .name = "sun3",
93   - .lock = SPIN_LOCK_UNLOCKED,
  93 + .lock = __SPIN_LOCK_UNLOCKED(sun3_irq_controller.lock),
94 94 .startup = m68k_irq_startup,
95 95 .shutdown = m68k_irq_shutdown,
96 96 .enable = sun3_enable_irq,