Commit f9a01539 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

m68k: remove timer_interrupt() function 



This gets passed to a number of init functions, but is
ignored everywhere, so remove the function and change the
mach_sched_init callback to take no arguments.

Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 42f1d57f

arch/m68k/68000/timers.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static struct clocksource m68328_clk = { 


/***************************************************************************/



void hw_timer_init(irq_handler_t handler)

void hw_timer_init(void)

{

	int ret;

arch/m68k/amiga/config.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static char *amiga_models[] __initdata = { 


static char amiga_model_name[13] = "Amiga ";



static void amiga_sched_init(irq_handler_t handler);

static void amiga_sched_init(void);

static void amiga_get_model(char *model);

static void amiga_get_hardware_list(struct seq_file *m);

extern void amiga_mksound(unsigned int count, unsigned int ticks);
@@ -483,7 +483,7 @@ static irqreturn_t ciab_timer_handler(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static void __init amiga_sched_init(irq_handler_t timer_routine)

static void __init amiga_sched_init(void)

{

	static struct resource sched_res = {

		.name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,

arch/m68k/apollo/config.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ u_long cpuctrl_physaddr; 
u_long timer_physaddr;

u_long apollo_model;



extern void dn_sched_init(irq_handler_t handler);

extern void dn_sched_init(void);

extern void dn_init_IRQ(void);

extern int dn_dummy_hwclk(int, struct rtc_time *);

extern void dn_dummy_reset(void);
@@ -179,7 +179,7 @@ irqreturn_t dn_timer_int(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



void dn_sched_init(irq_handler_t timer_routine)

void dn_sched_init(void)

{

	/* program timer 1 */

	*(volatile unsigned char *)(apollo_timer + 3) = 0x01;

arch/m68k/atari/config.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void atari_heartbeat(int on); 
#endif



/* atari specific timer functions (in time.c) */

extern void atari_sched_init(irq_handler_t);

extern void atari_sched_init(void);

extern int atari_mste_hwclk (int, struct rtc_time *);

extern int atari_tt_hwclk (int, struct rtc_time *);

arch/m68k/atari/time.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) 
}



void __init

atari_sched_init(irq_handler_t timer_routine)

atari_sched_init(void)

{

    /* set Timer C data Register */

    st_mfp.tim_dt_c = INT_TICKS;

CRA Git | Maintained and supported by SUSTech CRA and CCSE