Commit 241258d1 authored by Milind Arun Choudhary's avatar Milind Arun Choudhary Committed by Linus Torvalds

SPIN_LOCK_UNLOCKED cleanup in arch/m68k

SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead
Signed-off-by: default avatarMilind Arun Choudhary <milindchoudhary@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent edfe7a56
...@@ -54,7 +54,7 @@ static irqreturn_t ami_int5(int irq, void *dev_id); ...@@ -54,7 +54,7 @@ static irqreturn_t ami_int5(int irq, void *dev_id);
static struct irq_controller amiga_irq_controller = { static struct irq_controller amiga_irq_controller = {
.name = "amiga", .name = "amiga",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(amiga_irq_controller.lock),
.enable = amiga_enable_irq, .enable = amiga_enable_irq,
.disable = amiga_disable_irq, .disable = amiga_disable_irq,
}; };
......
...@@ -123,7 +123,7 @@ static void cia_disable_irq(unsigned int irq) ...@@ -123,7 +123,7 @@ static void cia_disable_irq(unsigned int irq)
static struct irq_controller cia_irq_controller = { static struct irq_controller cia_irq_controller = {
.name = "cia", .name = "cia",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(cia_irq_controller.lock),
.enable = cia_enable_irq, .enable = cia_enable_irq,
.disable = cia_disable_irq, .disable = cia_disable_irq,
}; };
...@@ -160,7 +160,7 @@ static void auto_disable_irq(unsigned int irq) ...@@ -160,7 +160,7 @@ static void auto_disable_irq(unsigned int irq)
static struct irq_controller auto_irq_controller = { static struct irq_controller auto_irq_controller = {
.name = "auto", .name = "auto",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
.enable = auto_enable_irq, .enable = auto_enable_irq,
.disable = auto_disable_irq, .disable = auto_disable_irq,
}; };
......
...@@ -31,7 +31,7 @@ void apollo_irq_shutdown(unsigned int irq) ...@@ -31,7 +31,7 @@ void apollo_irq_shutdown(unsigned int irq)
static struct irq_controller apollo_irq_controller = { static struct irq_controller apollo_irq_controller = {
.name = "apollo", .name = "apollo",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(apollo_irq_controller.lock),
.startup = apollo_irq_startup, .startup = apollo_irq_startup,
.shutdown = apollo_irq_shutdown, .shutdown = apollo_irq_shutdown,
}; };
......
...@@ -339,7 +339,7 @@ static void atari_shutdown_irq(unsigned int irq) ...@@ -339,7 +339,7 @@ static void atari_shutdown_irq(unsigned int irq)
static struct irq_controller atari_irq_controller = { static struct irq_controller atari_irq_controller = {
.name = "atari", .name = "atari",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(atari_irq_controller.lock),
.startup = atari_startup_irq, .startup = atari_startup_irq,
.shutdown = atari_shutdown_irq, .shutdown = atari_shutdown_irq,
.enable = atari_enable_irq, .enable = atari_enable_irq,
......
...@@ -59,14 +59,14 @@ static int m68k_first_user_vec; ...@@ -59,14 +59,14 @@ static int m68k_first_user_vec;
static struct irq_controller auto_irq_controller = { static struct irq_controller auto_irq_controller = {
.name = "auto", .name = "auto",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
.startup = m68k_irq_startup, .startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown, .shutdown = m68k_irq_shutdown,
}; };
static struct irq_controller user_irq_controller = { static struct irq_controller user_irq_controller = {
.name = "user", .name = "user",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
.startup = m68k_irq_startup, .startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown, .shutdown = m68k_irq_shutdown,
}; };
......
...@@ -219,7 +219,7 @@ static void mac_disable_irq(unsigned int irq); ...@@ -219,7 +219,7 @@ static void mac_disable_irq(unsigned int irq);
static struct irq_controller mac_irq_controller = { static struct irq_controller mac_irq_controller = {
.name = "mac", .name = "mac",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(mac_irq_controller.lock),
.enable = mac_enable_irq, .enable = mac_enable_irq,
.disable = mac_disable_irq, .disable = mac_disable_irq,
}; };
......
...@@ -59,7 +59,7 @@ static void q40_irq_shutdown(unsigned int irq) ...@@ -59,7 +59,7 @@ static void q40_irq_shutdown(unsigned int irq)
static struct irq_controller q40_irq_controller = { static struct irq_controller q40_irq_controller = {
.name = "q40", .name = "q40",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(q40_irq_controller.lock),
.startup = q40_irq_startup, .startup = q40_irq_startup,
.shutdown = q40_irq_shutdown, .shutdown = q40_irq_shutdown,
.enable = q40_enable_irq, .enable = q40_enable_irq,
......
...@@ -90,7 +90,7 @@ static void sun3_inthandle(unsigned int irq, struct pt_regs *fp) ...@@ -90,7 +90,7 @@ static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
static struct irq_controller sun3_irq_controller = { static struct irq_controller sun3_irq_controller = {
.name = "sun3", .name = "sun3",
.lock = SPIN_LOCK_UNLOCKED, .lock = __SPIN_LOCK_UNLOCKED(sun3_irq_controller.lock),
.startup = m68k_irq_startup, .startup = m68k_irq_startup,
.shutdown = m68k_irq_shutdown, .shutdown = m68k_irq_shutdown,
.enable = sun3_enable_irq, .enable = sun3_enable_irq,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment