aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-13 09:43:41 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-13 15:51:57 -0400
commit0f031b3f26c5fc019d541e41ae53b32e2dc6a373 (patch)
tree95b68754cf08df1e46c93ee138f6bf8fdd4b87ad
parent41eb17ce9888d759bf327cf0a4e1ea618016be64 (diff)
sparc32: drop unused clear_cpu_int
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/kernel/irq.h2
-rw-r--r--arch/sparc/kernel/leon_kernel.c8
-rw-r--r--arch/sparc/kernel/sun4d_irq.c5
-rw-r--r--arch/sparc/kernel/sun4m_irq.c6
4 files changed, 0 insertions, 21 deletions
diff --git a/arch/sparc/kernel/irq.h b/arch/sparc/kernel/irq.h
index b965df4c4b96..e2b5d5c9611e 100644
--- a/arch/sparc/kernel/irq.h
+++ b/arch/sparc/kernel/irq.h
@@ -98,10 +98,8 @@ static inline void load_profile_irq(int cpu, int limit)
98 98
99#ifdef CONFIG_SMP 99#ifdef CONFIG_SMP
100BTFIXUPDEF_CALL(void, set_cpu_int, int, int) 100BTFIXUPDEF_CALL(void, set_cpu_int, int, int)
101BTFIXUPDEF_CALL(void, clear_cpu_int, int, int)
102 101
103#define set_cpu_int(cpu,level) BTFIXUP_CALL(set_cpu_int)(cpu,level) 102#define set_cpu_int(cpu,level) BTFIXUP_CALL(set_cpu_int)(cpu,level)
104#define clear_cpu_int(cpu,level) BTFIXUP_CALL(clear_cpu_int)(cpu,level)
105 103
106/* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */ 104/* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */
107#define SUN4D_IPI_IRQ 13 105#define SUN4D_IPI_IRQ 13
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 06abbb371263..e57435f314fe 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -505,13 +505,6 @@ void leon_set_cpu_int(int cpu, int level)
505 LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->force[cpu], mask); 505 LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->force[cpu], mask);
506} 506}
507 507
508static void leon_clear_ipi(int cpu, int level)
509{
510 unsigned long mask;
511 mask = get_irqmask(level);
512 LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->force[cpu], mask<<16);
513}
514
515void leon_clear_profile_irq(int cpu) 508void leon_clear_profile_irq(int cpu)
516{ 509{
517} 510}
@@ -541,7 +534,6 @@ void __init leon_init_IRQ(void)
541 534
542#ifdef CONFIG_SMP 535#ifdef CONFIG_SMP
543 BTFIXUPSET_CALL(set_cpu_int, leon_set_cpu_int, BTFIXUPCALL_NORM); 536 BTFIXUPSET_CALL(set_cpu_int, leon_set_cpu_int, BTFIXUPCALL_NORM);
544 BTFIXUPSET_CALL(clear_cpu_int, leon_clear_ipi, BTFIXUPCALL_NORM);
545#endif 537#endif
546 538
547} 539}
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 7796fa511f27..15593ee1c120 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -248,10 +248,6 @@ static void sun4d_set_cpu_int(int cpu, int level)
248 sun4d_send_ipi(cpu, level); 248 sun4d_send_ipi(cpu, level);
249} 249}
250 250
251static void sun4d_clear_ipi(int cpu, int level)
252{
253}
254
255/* Setup IRQ distribution scheme. */ 251/* Setup IRQ distribution scheme. */
256void __init sun4d_distribute_irqs(void) 252void __init sun4d_distribute_irqs(void)
257{ 253{
@@ -523,7 +519,6 @@ void __init sun4d_init_IRQ(void)
523 519
524#ifdef CONFIG_SMP 520#ifdef CONFIG_SMP
525 BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM); 521 BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM);
526 BTFIXUPSET_CALL(clear_cpu_int, sun4d_clear_ipi, BTFIXUPCALL_NOP);
527#endif 522#endif
528 /* Cannot enable interrupts until OBP ticker is disabled. */ 523 /* Cannot enable interrupts until OBP ticker is disabled. */
529} 524}
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index fd8754dcce29..93f46035ce7c 100644
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -287,11 +287,6 @@ static void sun4m_send_ipi(int cpu, int level)
287{ 287{
288 sbus_writel(SUN4M_SOFT_INT(level), &sun4m_irq_percpu[cpu]->set); 288 sbus_writel(SUN4M_SOFT_INT(level), &sun4m_irq_percpu[cpu]->set);
289} 289}
290
291static void sun4m_clear_ipi(int cpu, int level)
292{
293 sbus_writel(SUN4M_SOFT_INT(level), &sun4m_irq_percpu[cpu]->clear);
294}
295#endif 290#endif
296 291
297struct sun4m_timer_percpu { 292struct sun4m_timer_percpu {
@@ -486,7 +481,6 @@ void __init sun4m_init_IRQ(void)
486 481
487#ifdef CONFIG_SMP 482#ifdef CONFIG_SMP
488 BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM); 483 BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);
489 BTFIXUPSET_CALL(clear_cpu_int, sun4m_clear_ipi, BTFIXUPCALL_NORM);
490#endif 484#endif
491 485
492 /* Cannot enable interrupts until OBP ticker is disabled. */ 486 /* Cannot enable interrupts until OBP ticker is disabled. */