aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/amiga
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 /arch/m68k/amiga
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>
Diffstat (limited to 'arch/m68k/amiga')
-rw-r--r--arch/m68k/amiga/amiints.c2
-rw-r--r--arch/m68k/amiga/cia.c4
2 files changed, 3 insertions, 3 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};