Commit 7d6ca235 authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven

m68k: Drop ARCH_USES_GETTIMEOFFSET

The functions that implement arch_gettimeoffset are re-used by
new clocksource drivers in subsequent patches.
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 6242c94d
...@@ -20,7 +20,6 @@ config M68K ...@@ -20,7 +20,6 @@ config M68K
select GENERIC_STRNCPY_FROM_USER if MMU select GENERIC_STRNCPY_FROM_USER if MMU
select GENERIC_STRNLEN_USER if MMU select GENERIC_STRNLEN_USER if MMU
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
select HAVE_MOD_ARCH_SPECIFIC select HAVE_MOD_ARCH_SPECIFIC
select MODULES_USE_ELF_REL select MODULES_USE_ELF_REL
......
...@@ -95,8 +95,6 @@ static char amiga_model_name[13] = "Amiga "; ...@@ -95,8 +95,6 @@ static char amiga_model_name[13] = "Amiga ";
static void amiga_sched_init(irq_handler_t handler); static void amiga_sched_init(irq_handler_t handler);
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);
/* amiga specific timer functions */
static u32 amiga_gettimeoffset(void);
extern void amiga_mksound(unsigned int count, unsigned int ticks); extern void amiga_mksound(unsigned int count, unsigned int ticks);
static void amiga_reset(void); static void amiga_reset(void);
extern void amiga_init_sound(void); extern void amiga_init_sound(void);
...@@ -386,7 +384,6 @@ void __init config_amiga(void) ...@@ -386,7 +384,6 @@ void __init config_amiga(void)
mach_init_IRQ = amiga_init_IRQ; mach_init_IRQ = amiga_init_IRQ;
mach_get_model = amiga_get_model; mach_get_model = amiga_get_model;
mach_get_hardware_list = amiga_get_hardware_list; mach_get_hardware_list = amiga_get_hardware_list;
arch_gettimeoffset = amiga_gettimeoffset;
/* /*
* default MAX_DMA=0xffffffff on all machines. If we don't do so, the SCSI * default MAX_DMA=0xffffffff on all machines. If we don't do so, the SCSI
......
...@@ -78,7 +78,6 @@ static void atari_heartbeat(int on); ...@@ -78,7 +78,6 @@ static void atari_heartbeat(int on);
/* 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(irq_handler_t);
extern u32 atari_gettimeoffset(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 *);
...@@ -205,7 +204,6 @@ void __init config_atari(void) ...@@ -205,7 +204,6 @@ void __init config_atari(void)
mach_init_IRQ = atari_init_IRQ; mach_init_IRQ = atari_init_IRQ;
mach_get_model = atari_get_model; mach_get_model = atari_get_model;
mach_get_hardware_list = atari_get_hardware_list; mach_get_hardware_list = atari_get_hardware_list;
arch_gettimeoffset = atari_gettimeoffset;
mach_reset = atari_reset; mach_reset = atari_reset;
mach_max_dma_address = 0xffffff; mach_max_dma_address = 0xffffff;
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP) #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
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(irq_handler_t handler);
extern u32 bvme6000_gettimeoffset(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);
...@@ -105,7 +104,6 @@ void __init config_bvme6000(void) ...@@ -105,7 +104,6 @@ void __init config_bvme6000(void)
mach_max_dma_address = 0xffffffff; mach_max_dma_address = 0xffffffff;
mach_sched_init = bvme6000_sched_init; mach_sched_init = bvme6000_sched_init;
mach_init_IRQ = bvme6000_init_IRQ; mach_init_IRQ = bvme6000_init_IRQ;
arch_gettimeoffset = bvme6000_gettimeoffset;
mach_hwclk = bvme6000_hwclk; mach_hwclk = bvme6000_hwclk;
mach_reset = bvme6000_reset; mach_reset = bvme6000_reset;
mach_get_model = bvme6000_get_model; mach_get_model = bvme6000_get_model;
......
...@@ -254,7 +254,6 @@ void __init config_hp300(void) ...@@ -254,7 +254,6 @@ void __init config_hp300(void)
mach_sched_init = hp300_sched_init; mach_sched_init = hp300_sched_init;
mach_init_IRQ = hp300_init_IRQ; mach_init_IRQ = hp300_init_IRQ;
mach_get_model = hp300_get_model; mach_get_model = hp300_get_model;
arch_gettimeoffset = hp300_gettimeoffset;
mach_hwclk = hp300_hwclk; mach_hwclk = hp300_hwclk;
mach_get_ss = hp300_get_ss; mach_get_ss = hp300_get_ss;
mach_reset = hp300_reset; mach_reset = hp300_reset;
......
extern void hp300_sched_init(irq_handler_t vector); extern void hp300_sched_init(irq_handler_t vector);
extern u32 hp300_gettimeoffset(void);
...@@ -54,8 +54,6 @@ struct mac_booter_data mac_bi_data; ...@@ -54,8 +54,6 @@ struct mac_booter_data mac_bi_data;
/* The phys. video addr. - might be bogus on some machines */ /* The phys. video addr. - might be bogus on some machines */
static unsigned long mac_orig_videoaddr; static unsigned long mac_orig_videoaddr;
/* Mac specific timer functions */
extern u32 mac_gettimeoffset(void);
extern int mac_hwclk(int, struct rtc_time *); 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);
...@@ -155,7 +153,6 @@ void __init config_mac(void) ...@@ -155,7 +153,6 @@ void __init config_mac(void)
mach_sched_init = mac_sched_init; mach_sched_init = mac_sched_init;
mach_init_IRQ = mac_init_IRQ; mach_init_IRQ = mac_init_IRQ;
mach_get_model = mac_get_model; mach_get_model = mac_get_model;
arch_gettimeoffset = mac_gettimeoffset;
mach_hwclk = mac_hwclk; mach_hwclk = mac_hwclk;
mach_reset = mac_reset; mach_reset = mac_reset;
mach_halt = mac_poweroff; mach_halt = mac_poweroff;
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
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(irq_handler_t handler);
extern u32 mvme147_gettimeoffset(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);
...@@ -84,7 +83,6 @@ void __init config_mvme147(void) ...@@ -84,7 +83,6 @@ void __init config_mvme147(void)
mach_max_dma_address = 0x01000000; mach_max_dma_address = 0x01000000;
mach_sched_init = mvme147_sched_init; mach_sched_init = mvme147_sched_init;
mach_init_IRQ = mvme147_init_IRQ; mach_init_IRQ = mvme147_init_IRQ;
arch_gettimeoffset = mvme147_gettimeoffset;
mach_hwclk = mvme147_hwclk; mach_hwclk = mvme147_hwclk;
mach_reset = mvme147_reset; mach_reset = mvme147_reset;
mach_get_model = mvme147_get_model; mach_get_model = mvme147_get_model;
......
...@@ -44,7 +44,6 @@ static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; ...@@ -44,7 +44,6 @@ 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(irq_handler_t handler);
extern u32 mvme16x_gettimeoffset(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);
...@@ -272,7 +271,6 @@ void __init config_mvme16x(void) ...@@ -272,7 +271,6 @@ void __init config_mvme16x(void)
mach_max_dma_address = 0xffffffff; mach_max_dma_address = 0xffffffff;
mach_sched_init = mvme16x_sched_init; mach_sched_init = mvme16x_sched_init;
mach_init_IRQ = mvme16x_init_IRQ; mach_init_IRQ = mvme16x_init_IRQ;
arch_gettimeoffset = mvme16x_gettimeoffset;
mach_hwclk = mvme16x_hwclk; mach_hwclk = mvme16x_hwclk;
mach_reset = mvme16x_reset; mach_reset = mvme16x_reset;
mach_get_model = mvme16x_get_model; mach_get_model = mvme16x_get_model;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment