From 3d373ce82aaa2b5380d91074aa88879108b47ecf Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 3 Feb 2011 00:46:48 +0000 Subject: ia64: Remove stale irq_chip.end irq_chip.end got obsolete with the removal of __do_IRQ(). Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Tony Luck LKML-Reference: <20110203004210.143127544@linutronix.de> --- arch/ia64/hp/sim/hpsim_irq.c | 1 - arch/ia64/kernel/iosapic.c | 2 -- arch/ia64/kernel/irq_lsapic.c | 1 - arch/ia64/sn/kernel/irq.c | 23 ----------------------- 4 files changed, 27 deletions(-) (limited to 'arch/ia64') diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c index b272261d77c..4a1d5fafdf9 100644 --- a/arch/ia64/hp/sim/hpsim_irq.c +++ b/arch/ia64/hp/sim/hpsim_irq.c @@ -34,7 +34,6 @@ static struct irq_chip irq_type_hp_sim = { .enable = hpsim_irq_noop, .disable = hpsim_irq_noop, .ack = hpsim_irq_noop, - .end = hpsim_irq_noop, .set_affinity = hpsim_set_affinity_noop, }; diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 22c38404f53..d21f9af8170 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c @@ -460,7 +460,6 @@ iosapic_ack_edge_irq (unsigned int irq) #define iosapic_enable_edge_irq unmask_irq #define iosapic_disable_edge_irq nop -#define iosapic_end_edge_irq nop static struct irq_chip irq_type_iosapic_edge = { .name = "IO-SAPIC-edge", @@ -469,7 +468,6 @@ static struct irq_chip irq_type_iosapic_edge = { .enable = iosapic_enable_edge_irq, .disable = iosapic_disable_edge_irq, .ack = iosapic_ack_edge_irq, - .end = iosapic_end_edge_irq, .mask = mask_irq, .unmask = unmask_irq, .set_affinity = iosapic_set_affinity diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c index fc1549d4564..a50dffa85d0 100644 --- a/arch/ia64/kernel/irq_lsapic.c +++ b/arch/ia64/kernel/irq_lsapic.c @@ -40,6 +40,5 @@ struct irq_chip irq_type_ia64_lsapic = { .enable = lsapic_noop, .disable = lsapic_noop, .ack = lsapic_noop, - .end = lsapic_noop, .retrigger = lsapic_retrigger, }; diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 13c15d96809..658c716283c 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c @@ -114,28 +114,6 @@ static void sn_ack_irq(unsigned int irq) move_native_irq(irq); } -static void sn_end_irq(unsigned int irq) -{ - int ivec; - u64 event_occurred; - - ivec = irq & 0xff; - if (ivec == SGI_UART_VECTOR) { - event_occurred = HUB_L((u64*)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED)); - /* If the UART bit is set here, we may have received an - * interrupt from the UART that the driver missed. To - * make sure, we IPI ourselves to force us to look again. - */ - if (event_occurred & SH_EVENT_OCCURRED_UART_INT_MASK) { - platform_send_ipi(smp_processor_id(), SGI_UART_VECTOR, - IA64_IPI_DM_INT, 0); - } - } - __clear_bit(ivec, (volatile void *)pda->sn_in_service_ivecs); - if (sn_force_interrupt_flag) - force_interrupt(irq); -} - static void sn_irq_info_free(struct rcu_head *head); struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info, @@ -275,7 +253,6 @@ struct irq_chip irq_type_sn = { .enable = sn_enable_irq, .disable = sn_disable_irq, .ack = sn_ack_irq, - .end = sn_end_irq, .mask = sn_mask_irq, .unmask = sn_unmask_irq, .set_affinity = sn_set_affinity_irq -- cgit v1.2.3-70-g09d2