Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1ea9acc7823587266a26293a3b74deafc6637427

Authored by Greg Ungerer
Committed by Linus Torvalds
1 parent b032fde909
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] m68knommu: use irq_handler_t for passing handler types in 68328 setup 

Use irq_handler_t type for passing around timer interrupt routine
in 368360 setup code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 6 additions and 3 deletions Side-by-side Diff

arch/m68knommu/platform/68328/timers.c
Diff comments   View file @ 1ea9acc
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/types.h>
18 18 #include <linux/kernel.h>
19 19 #include <linux/mm.h>
  20 +#include <linux/interrupt.h>
20 21 #include <asm/setup.h>
21 22 #include <asm/system.h>
22 23 #include <asm/pgtable.h>
... ... @@ -52,7 +53,7 @@
52 53  
53 54 /***************************************************************************/
54 55  
55   -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *))
  56 +void m68328_timer_init(irq_handler_t timer_routine)
56 57 {
57 58 /* disable timer 1 */
58 59 TCTL = 0;
arch/m68knommu/platform/68EZ328/config.c
Diff comments   View file @ 1ea9acc
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/mm.h>
20 20 #include <linux/tty.h>
21 21 #include <linux/console.h>
  22 +#include <linux/interrupt.h>
22 23  
23 24 #include <asm/setup.h>
24 25 #include <asm/system.h>
... ... @@ -31,7 +32,7 @@
31 32  
32 33 /***************************************************************************/
33 34  
34   -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *));
  35 +void m68328_timer_init(irq_handler_t timer_routine);
35 36 void m68328_timer_tick(void);
36 37 unsigned long m68328_timer_gettimeoffset(void);
37 38 void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
arch/m68knommu/platform/68VZ328/config.c
Diff comments   View file @ 1ea9acc
... ... @@ -21,6 +21,7 @@
21 21 #include <linux/console.h>
22 22 #include <linux/kd.h>
23 23 #include <linux/netdevice.h>
  24 +#include <linux/interrupt.h>
24 25  
25 26 #include <asm/setup.h>
26 27 #include <asm/system.h>
... ... @@ -36,7 +37,7 @@
36 37  
37 38 /***************************************************************************/
38 39  
39   -void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *));
  40 +void m68328_timer_init(irq_handler_t timer_routine);
40 41 void m68328_timer_tick(void);
41 42 unsigned long m68328_timer_gettimeoffset(void);
42 43 void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);