From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262037AbTELJzp (ORCPT ); Mon, 12 May 2003 05:55:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262063AbTELJq7 (ORCPT ); Mon, 12 May 2003 05:46:59 -0400 Received: from amsfep12-int.chello.nl ([213.46.243.18]:19022 "EHLO amsfep12-int.chello.nl") by vger.kernel.org with ESMTP id S262036AbTELJpI (ORCPT ); Mon, 12 May 2003 05:45:08 -0400 Date: Mon, 12 May 2003 11:54:40 +0200 Message-Id: <200305120954.h4C9seet001015@callisto.of.borg> From: Geert Uytterhoeven To: Linus Torvalds Cc: Linux Kernel Development , Geert Uytterhoeven Subject: [PATCH] M68k IRQ API updates [11/20] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org M68k Sun-3: Update to the new irq API (from Roman Zippel and me) [11/20] --- linux-2.5.69/arch/m68k/sun3/config.c Wed Mar 5 10:06:39 2003 +++ linux-m68k-2.5.69/arch/m68k/sun3/config.c Tue May 6 13:50:50 2003 @@ -37,7 +37,7 @@ extern unsigned long sun3_gettimeoffset(void); extern int show_sun3_interrupts (struct seq_file *, void *); -extern void sun3_sched_init(void (*handler)(int, void *, struct pt_regs *)); +extern void sun3_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)); extern void sun3_get_model (char* model); extern void idprom_init (void); extern int sun3_hwclk(int set, struct rtc_time *t); @@ -174,7 +174,7 @@ sun3_bootmem_alloc(memory_start, memory_end); } -void __init sun3_sched_init(void (*timer_routine)(int, void *, struct pt_regs *)) +void __init sun3_sched_init(irqreturn_t (*timer_routine)(int, void *, struct pt_regs *)) { sun3_disable_interrupts(); intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE); --- linux-2.5.69/arch/m68k/sun3/sun3ints.c Tue Nov 5 10:09:42 2002 +++ linux-m68k-2.5.69/arch/m68k/sun3/sun3ints.c Fri May 9 10:21:30 2003 @@ -18,7 +18,7 @@ #include extern void sun3_leds (unsigned char); -static void sun3_inthandle(int irq, void *dev_id, struct pt_regs *fp); +static irqreturn_t sun3_inthandle(int irq, void *dev_id, struct pt_regs *fp); void sun3_disable_interrupts(void) { @@ -64,15 +64,16 @@ *sun3_intreg |= (1<= 64) && (irq <= 255)) { @@ -239,8 +243,7 @@ panic ("bad interrupt vector %d received\n",irq); vec_ints[vec]++; - sun3_vechandler[vec](irq, vec_ids[vec], regs); - return; + return sun3_vechandler[vec](irq, vec_ids[vec], regs); } else { panic("sun3_process_int: unable to handle interrupt vector %d\n", irq); --- linux-2.5.69/include/asm-m68k/sun3ints.h Tue Nov 5 10:10:13 2002 +++ linux-m68k-2.5.69/include/asm-m68k/sun3ints.h Fri May 9 10:21:35 2003 @@ -26,17 +26,17 @@ void sun3_enable_irq(unsigned int irq); void sun3_disable_irq(unsigned int irq); int sun3_request_irq(unsigned int irq, - void (*handler)(int, void *, struct pt_regs *), + irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id ); extern void sun3_init_IRQ (void); -extern void (*sun3_default_handler[]) (int, void *, struct pt_regs *); -extern void (*sun3_inthandler[]) (int, void *, struct pt_regs *); +extern irqreturn_t (*sun3_default_handler[]) (int, void *, struct pt_regs *); +extern irqreturn_t (*sun3_inthandler[]) (int, void *, struct pt_regs *); extern void sun3_free_irq (unsigned int irq, void *dev_id); extern void sun3_enable_interrupts (void); extern void sun3_disable_interrupts (void); extern int show_sun3_interrupts(struct seq_file *, void *); -extern void sun3_process_int(int, struct pt_regs *); +extern irqreturn_t sun3_process_int(int, struct pt_regs *); extern volatile unsigned char* sun3_intreg; /* master list of VME vectors -- don't fuck with this */ Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds