leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m68k: remove timer_interrupt() function

Browse Source 
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: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-09-24 17:29:17 +02:00
parent 42f1d57f05
commit f9a015391e
24 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/68000/timers.c
View File

@ -91,7 +91,7 @@ static struct clocksource m68328_clk = {
/***************************************************************************/ /***************************************************************************/
void hw_timer_init(irq_handler_t handler) void hw_timer_init(void)
{ {
int ret; int ret;

4
arch/m68k/amiga/config.c
View File

@ -92,7 +92,7 @@ static char *amiga_models[] __initdata = {
static char amiga_model_name[13] = "Amiga "; 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_model(char *model);
static void amiga_get_hardware_list(struct seq_file *m); static void amiga_get_hardware_list(struct seq_file *m);
extern void amiga_mksound(unsigned int count, unsigned int ticks); 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; 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 = { static struct resource sched_res = {
.name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff, .name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,

4
arch/m68k/apollo/config.c
View File

@ -26,7 +26,7 @@ u_long cpuctrl_physaddr;
u_long timer_physaddr; u_long timer_physaddr;
u_long apollo_model; 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 void dn_init_IRQ(void);
extern int dn_dummy_hwclk(int, struct rtc_time *); extern int dn_dummy_hwclk(int, struct rtc_time *);
extern void dn_dummy_reset(void); extern void dn_dummy_reset(void);
@ -179,7 +179,7 @@ irqreturn_t dn_timer_int(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void dn_sched_init(irq_handler_t timer_routine) void dn_sched_init(void)
{ {
/* program timer 1 */ /* program timer 1 */
*(volatile unsigned char *)(apollo_timer + 3) = 0x01; *(volatile unsigned char *)(apollo_timer + 3) = 0x01;

2
arch/m68k/atari/config.c
View File

@ -77,7 +77,7 @@ static void atari_heartbeat(int on);
#endif #endif
/* atari specific timer functions (in time.c) */ /* 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_mste_hwclk (int, struct rtc_time *);
extern int atari_tt_hwclk (int, struct rtc_time *); extern int atari_tt_hwclk (int, struct rtc_time *);

2
arch/m68k/atari/time.c
View File

@ -56,7 +56,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id)
} }
void __init void __init
atari_sched_init(irq_handler_t timer_routine) atari_sched_init(void)
{ {
/* set Timer C data Register */ /* set Timer C data Register */
st_mfp.tim_dt_c = INT_TICKS; st_mfp.tim_dt_c = INT_TICKS;

4
arch/m68k/bvme6000/config.c
View File

@ -38,7 +38,7 @@
#include <asm/bvme6000hw.h> #include <asm/bvme6000hw.h>
static void bvme6000_get_model(char *model); static void bvme6000_get_model(char *model);
extern void bvme6000_sched_init(irq_handler_t handler); extern void bvme6000_sched_init(void);
extern int bvme6000_hwclk (int, struct rtc_time *); extern int bvme6000_hwclk (int, struct rtc_time *);
extern void bvme6000_reset (void); extern void bvme6000_reset (void);
void bvme6000_set_vectors (void); void bvme6000_set_vectors (void);
@ -189,7 +189,7 @@ static irqreturn_t bvme6000_timer_int (int irq, void *dev_id)
* so divide by 8 to get the microsecond result. * so divide by 8 to get the microsecond result.
*/ */
void bvme6000_sched_init (irq_handler_t timer_routine) void bvme6000_sched_init (void)
{ {
volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE; volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;
unsigned char msr = rtc->msr & 0xc0; unsigned char msr = rtc->msr & 0xc0;

2
arch/m68k/coldfire/pit.c
View File

@ -136,7 +136,7 @@ static struct clocksource pit_clk = {
/***************************************************************************/ /***************************************************************************/
void hw_timer_init(irq_handler_t handler) void hw_timer_init(void)
{ {
int ret; int ret;

2
arch/m68k/coldfire/sltimers.c
View File

@ -118,7 +118,7 @@ static struct clocksource mcfslt_clk = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS, .flags = CLOCK_SOURCE_IS_CONTINUOUS,
}; };
void hw_timer_init(irq_handler_t handler) void hw_timer_init(void)
{ {
int r; int r;

2
arch/m68k/coldfire/timers.c
View File

@ -107,7 +107,7 @@ static struct clocksource mcftmr_clk = {
/***************************************************************************/ /***************************************************************************/
void hw_timer_init(irq_handler_t handler) void hw_timer_init(void)
{ {
int r; int r;

2
arch/m68k/hp300/time.c
View File

@ -98,7 +98,7 @@ again:
return ticks; return ticks;
} }
void __init hp300_sched_init(irq_handler_t vector) void __init hp300_sched_init(void)
{ {
out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */ out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */
out_8(CLOCKBASE + CLKCR1, 0x1); /* reset */ out_8(CLOCKBASE + CLKCR1, 0x1); /* reset */

2
arch/m68k/hp300/time.h
View File

@ -1 +1 @@
extern void hp300_sched_init(irq_handler_t vector); extern void hp300_sched_init(void);

5
arch/m68k/include/asm/machdep.h
View File

@ -12,7 +12,7 @@ struct rtc_time;
struct rtc_pll_info; struct rtc_pll_info;
struct buffer_head; struct buffer_head;
extern void (*mach_sched_init) (irq_handler_t handler); extern void (*mach_sched_init) (void);
/* machine dependent irq functions */ /* machine dependent irq functions */
extern void (*mach_init_IRQ) (void); extern void (*mach_init_IRQ) (void);
extern void (*mach_get_model) (char *model); extern void (*mach_get_model) (char *model);
@ -33,8 +33,7 @@ extern void (*mach_l2_flush) (int);
extern void (*mach_beep) (unsigned int, unsigned int); extern void (*mach_beep) (unsigned int, unsigned int);
/* Hardware clock functions */ /* Hardware clock functions */
extern void hw_timer_init(irq_handler_t handler); extern void hw_timer_init(void);
extern unsigned long hw_timer_offset(void);
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
extern void timer_heartbeat(void); extern void timer_heartbeat(void);
#else #else

2
arch/m68k/kernel/setup_mm.c
View File

@ -82,7 +82,7 @@ static struct m68k_mem_info m68k_ramdisk __initdata;
static char m68k_command_line[CL_SIZE] __initdata; static char m68k_command_line[CL_SIZE] __initdata;
void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; void (*mach_sched_init) (void) __initdata = NULL;
/* machine dependent irq functions */ /* machine dependent irq functions */
void (*mach_init_IRQ) (void) __initdata = NULL; void (*mach_init_IRQ) (void) __initdata = NULL;
void (*mach_get_model) (char *model); void (*mach_get_model) (char *model);

2
arch/m68k/kernel/setup_no.c
View File

@ -49,7 +49,7 @@ EXPORT_SYMBOL(memory_end);
char __initdata command_line[COMMAND_LINE_SIZE]; char __initdata command_line[COMMAND_LINE_SIZE];
/* machine dependent timer functions */ /* machine dependent timer functions */
void (*mach_sched_init)(irq_handler_t handler) __initdata = NULL; void (*mach_sched_init)(void) __initdata = NULL;
int (*mach_hwclk) (int, struct rtc_time*); int (*mach_hwclk) (int, struct rtc_time*);
/* machine dependent reboot functions */ /* machine dependent reboot functions */

15
arch/m68k/kernel/time.c
View File

@ -35,19 +35,6 @@
unsigned long (*mach_random_get_entropy)(void); unsigned long (*mach_random_get_entropy)(void);
EXPORT_SYMBOL_GPL(mach_random_get_entropy); EXPORT_SYMBOL_GPL(mach_random_get_entropy);
/*
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "xtime_update()" routine every clocktick
*/
static irqreturn_t timer_interrupt(int irq, void *dummy)
{
xtime_update(1);
update_process_times(user_mode(get_irq_regs()));
profile_tick(CPU_PROFILING);
return IRQ_HANDLED;
}
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
void timer_heartbeat(void) void timer_heartbeat(void)
{ {
@ -157,5 +144,5 @@ module_init(rtc_init);
void __init time_init(void) void __init time_init(void)
{ {
mach_sched_init(timer_interrupt); mach_sched_init();
} }

6
arch/m68k/mac/config.c
View File

@ -58,7 +58,7 @@ extern int mac_hwclk(int, struct rtc_time *);
extern void iop_preinit(void); extern void iop_preinit(void);
extern void iop_init(void); extern void iop_init(void);
extern void via_init(void); extern void via_init(void);
extern void via_init_clock(irq_handler_t func); extern void via_init_clock(void);
extern void oss_init(void); extern void oss_init(void);
extern void psc_init(void); extern void psc_init(void);
extern void baboon_init(void); extern void baboon_init(void);
@ -69,9 +69,9 @@ static void mac_get_model(char *str);
static void mac_identify(void); static void mac_identify(void);
static void mac_report_hardware(void); static void mac_report_hardware(void);
static void __init mac_sched_init(irq_handler_t vector) static void __init mac_sched_init(void)
{ {
via_init_clock(vector); via_init_clock();
} }
/* /*

2
arch/m68k/mac/via.c
View File

@ -609,7 +609,7 @@ static irqreturn_t via_timer_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void __init via_init_clock(irq_handler_t timer_routine) void __init via_init_clock(void)
{ {
if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, IRQF_TIMER, "timer", if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, IRQF_TIMER, "timer",
NULL)) { NULL)) {

4
arch/m68k/mvme147/config.c
View File

@ -37,7 +37,7 @@
static void mvme147_get_model(char *model); static void mvme147_get_model(char *model);
extern void mvme147_sched_init(irq_handler_t handler); extern void mvme147_sched_init(void);
extern int mvme147_hwclk (int, struct rtc_time *); extern int mvme147_hwclk (int, struct rtc_time *);
extern void mvme147_reset (void); extern void mvme147_reset (void);
@ -125,7 +125,7 @@ static irqreturn_t mvme147_timer_int (int irq, void *dev_id)
} }
void mvme147_sched_init (irq_handler_t timer_routine) void mvme147_sched_init (void)
{ {
if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQF_TIMER, if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQF_TIMER,
"timer 1", NULL)) "timer 1", NULL))

4
arch/m68k/mvme16x/config.c
View File

@ -43,7 +43,7 @@ extern t_bdid mvme_bdid;
static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
static void mvme16x_get_model(char *model); static void mvme16x_get_model(char *model);
extern void mvme16x_sched_init(irq_handler_t handler); extern void mvme16x_sched_init(void);
extern int mvme16x_hwclk (int, struct rtc_time *); extern int mvme16x_hwclk (int, struct rtc_time *);
extern void mvme16x_reset (void); extern void mvme16x_reset (void);
@ -384,7 +384,7 @@ static irqreturn_t mvme16x_timer_int (int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void mvme16x_sched_init (irq_handler_t timer_routine) void mvme16x_sched_init(void)
{ {
uint16_t brdno = be16_to_cpu(mvme_bdid.brdno); uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
int irq; int irq;

2
arch/m68k/q40/config.c
View File

@ -37,7 +37,7 @@
extern void q40_init_IRQ(void); extern void q40_init_IRQ(void);
static void q40_get_model(char *model); static void q40_get_model(char *model);
extern void q40_sched_init(irq_handler_t handler); extern void q40_sched_init(void);
static int q40_hwclk(int, struct rtc_time *); static int q40_hwclk(int, struct rtc_time *);
static unsigned int q40_get_ss(void); static unsigned int q40_get_ss(void);

2
arch/m68k/q40/q40ints.c
View File

@ -149,7 +149,7 @@ static irqreturn_t q40_timer_int(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void q40_sched_init (irq_handler_t timer_routine) void q40_sched_init (void)
{ {
int timer_irq; int timer_irq;

4
arch/m68k/sun3/config.c
View File

@ -36,7 +36,7 @@
char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; char sun3_reserved_pmeg[SUN3_PMEGS_NUM];
static void sun3_sched_init(irq_handler_t handler); static void sun3_sched_init(void);
extern void sun3_get_model (char* model); extern void sun3_get_model (char* model);
extern int sun3_hwclk(int set, struct rtc_time *t); extern int sun3_hwclk(int set, struct rtc_time *t);
@ -151,7 +151,7 @@ void __init config_sun3(void)
sun3_bootmem_alloc(memory_start, memory_end); sun3_bootmem_alloc(memory_start, memory_end);
} }
static void __init sun3_sched_init(irq_handler_t timer_routine) static void __init sun3_sched_init(void)
{ {
sun3_disable_interrupts(); sun3_disable_interrupts();
intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE); intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE);

2
arch/m68k/sun3x/time.c
View File

@ -90,7 +90,7 @@ static irqreturn_t sun3x_timer_tick(int irq, void *dev_id)
} }
#endif #endif
void __init sun3x_sched_init(irq_handler_t vector) void __init sun3x_sched_init(void)
{ {
sun3_disable_interrupts(); sun3_disable_interrupts();

2
arch/m68k/sun3x/time.h
View File

@ -3,7 +3,7 @@
#define SUN3X_TIME_H #define SUN3X_TIME_H
extern int sun3x_hwclk(int set, struct rtc_time *t); extern int sun3x_hwclk(int set, struct rtc_time *t);
void sun3x_sched_init(irq_handler_t vector); void sun3x_sched_init(void);
struct mostek_dt { struct mostek_dt {
volatile unsigned char csr; volatile unsigned char csr;