From 90968eb5a415a0fe6ffb617af35b3a5321bd4497 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 31 Oct 2007 05:07:08 -0400 Subject: ARM minor irq handler cleanup: avoid passing unused info to irq Reduce human confusion a bit, by /not/ passing an unused value to arm_rtc_interrupt() Signed-off-by: Jeff Garzik --- arch/arm/mach-integrator/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c index 5278f589fcee..5235f64f235b 100644 --- a/arch/arm/mach-integrator/time.c +++ b/arch/arm/mach-integrator/time.c @@ -125,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id) xtime.tv_sec = __raw_readl(rtc_base + RTC_DR); ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED, - "rtc-pl030", dev); + "rtc-pl030", NULL); if (ret) goto map_out; -- cgit v1.2.3-59-g8ed1b From 5dc0742b41066e1e141f2b4b00557e563a83fccc Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 31 Oct 2007 05:08:48 -0400 Subject: [SPARC] minor irq handler cleanups - mark timer_interrupt() static - sparc_floppy_request_irq() prototype should use irq_handler_t Signed-off-by: Jeff Garzik Acked-by: David S. Miller --- arch/sparc/kernel/time.c | 2 +- include/asm-sparc/floppy.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index cfaf22c05bc4..53caacbb3982 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c @@ -105,7 +105,7 @@ __volatile__ unsigned int *master_l10_limit; #define TICK_SIZE (tick_nsec / 1000) -irqreturn_t timer_interrupt(int irq, void *dev_id) +static irqreturn_t timer_interrupt(int dummy, void *dev_id) { /* last time the cmos clock got updated */ static long last_rtc_update; diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h index dbe7a586be5b..d3978e068e2b 100644 --- a/include/asm-sparc/floppy.h +++ b/include/asm-sparc/floppy.h @@ -280,7 +280,7 @@ static inline void sun_fd_enable_dma(void) /* Our low-level entry point in arch/sparc/kernel/entry.S */ extern int sparc_floppy_request_irq(int irq, unsigned long flags, - irqreturn_t (*irq_handler)(int irq, void *)); + irq_handler_t irq_handler); static int sun_fd_request_irq(void) { -- cgit v1.2.3-59-g8ed1b From 349a2444cfcd6c078a8410c19cd7a950ff89bd96 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 31 Oct 2007 05:11:45 -0400 Subject: [BLACKFIN] minor irq handler cleanups - use standard irq_handler_t to define irq handler function arguments Signed-off-by: Jeff Garzik --- arch/blackfin/kernel/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index 9bdc8f99183a..715b3945e4c7 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c @@ -39,8 +39,7 @@ /* This is an NTP setting */ #define TICK_SIZE (tick_nsec / 1000) -static void time_sched_init(irqreturn_t(*timer_routine) - (int, void *)); +static void time_sched_init(irq_handler_t timer_routine); static unsigned long gettimeoffset(void); static struct irqaction bfin_timer_irq = { @@ -64,7 +63,7 @@ static struct irqaction bfin_timer_irq = { #define TIME_SCALE 1 static void -time_sched_init(irqreturn_t(*timer_routine) (int, void *)) +time_sched_init(irq_handler_t timer_routine) { u32 tcount; -- cgit v1.2.3-59-g8ed1b From e8f39549580e04e0b8edd11bae834ae7f8322fc8 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 31 Oct 2007 05:15:20 -0400 Subject: [PPC] minor irq handler cleanups - whitespace cleanups - remove pointless prototype (uses always follow func implementation) - 'irq' argument is used here purely as a local variable. rename argument to 'dummy' and define 'irq' as local to make this plain. Signed-off-by: Jeff Garzik Acked-by: Kumar Gala --- arch/ppc/8xx_io/fec.c | 3 +-- arch/ppc/platforms/sbc82xx.c | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 11b0aa6ca97e..d7b7ba93e1de 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c @@ -199,7 +199,6 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); #ifdef CONFIG_USE_MDIO static void fec_enet_mii(struct net_device *dev); #endif /* CONFIG_USE_MDIO */ -static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); #ifdef CONFIG_FEC_PACKETHOOK static void fec_enet_tx(struct net_device *dev, __u32 regval); static void fec_enet_rx(struct net_device *dev, __u32 regval); @@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev) * This is called from the MPC core interrupt. */ static irqreturn_t -fec_enet_interrupt(int irq, void * dev_id) +fec_enet_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; volatile fec_t *fecp; diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c index cc0935ccab7a..0df6aacb8237 100644 --- a/arch/ppc/platforms/sbc82xx.c +++ b/arch/ppc/platforms/sbc82xx.c @@ -121,8 +121,10 @@ struct hw_interrupt_type sbc82xx_i8259_ic = { .end = sbc82xx_i8259_end_irq, }; -static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id) +static irqreturn_t sbc82xx_i8259_demux(int dummy, void *dev_id) { + int irq; + spin_lock(&sbc82xx_i8259_lock); sbc82xx_i8259_map[0] = 0x0c; /* OCW3: Read IR register on RD# pulse */ -- cgit v1.2.3-59-g8ed1b