This change's main purpose is to prepare for the patchset in
jgarzik/misc-2.6.git#irq-remove, that explores removal of the
never-used 'irq' argument in each interrupt handler.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---
arch/avr32/kernel/time.c | 4 ++--
arch/avr32/mach-at32ap/time-tc.c | 2 +-
include/asm-avr32/arch-at32ap/time.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 36a46c3..d6bb69c 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -150,7 +150,7 @@ int __weak avr32_hpt_start(void)
*
* In UP mode, it is invoked from the (global) timer_interrupt.
*/
-void local_timer_interrupt(int irq, void *dev_id)
+void local_timer_interrupt(void *dev_id)
{
if (current->pid)
profile_tick(CPU_PROFILING);
@@ -175,7 +175,7 @@ irqreturn_t __weak timer_interrupt(int irq, void *dev_id)
*
* SMP is not supported yet.
*/
- local_timer_interrupt(irq, dev_id);
+ local_timer_interrupt(dev_id);
return IRQ_HANDLED;
}
diff --git a/arch/avr32/mach-at32ap/time-tc.c b/arch/avr32/mach-at32ap/time-tc.c
index 1026586..53e8e6e 100644
--- a/arch/avr32/mach-at32ap/time-tc.c
+++ b/arch/avr32/mach-at32ap/time-tc.c
@@ -209,7 +209,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
*
* SMP is not supported yet.
*/
- local_timer_interrupt(irq, dev_id);
+ local_timer_interrupt(dev_id);
return IRQ_HANDLED;
}
diff --git a/include/asm-avr32/arch-at32ap/time.h b/include/asm-avr32/arch-at32ap/time.h
index cc8a434..d23b5b0 100644
--- a/include/asm-avr32/arch-at32ap/time.h
+++ b/include/asm-avr32/arch-at32ap/time.h
@@ -13,7 +13,7 @@
extern struct irqaction timer_irqaction;
extern struct platform_device at32_systc0_device;
-extern void local_timer_interrupt(int irq, void *dev_id);
+extern void local_timer_interrupt(void *dev_id);
#define TIMER_BCR 0x000000c0
#define TIMER_BCR_SYNC 0
--
1.5.4.1
--
| Jeremy Allison | Re: [RFC] Heads up on sys_fallocate() |
| Greg KH | [GIT PATCH] driver core patches against 2.6.24 |
| Joerg Roedel | [PATCH 03/34] AMD IOMMU: add defines and structures for ACPI scanning code |
| Eric W. Biederman | [PATCH] powerpc pseries eeh: Convert to kthread API |
| David Miller | [GIT]: Networking |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| Natalie Protasevich | [BUG] New Kernel Bugs |
git: | |
