Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4409299imu; Fri, 30 Nov 2018 17:02:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xziwbiddmd4m+59HA2X9m9eFJVg/FjE49IrPYfyqOmu9vtdePnb5vexlmy5Nwv6cM4bHmR X-Received: by 2002:a63:2c0e:: with SMTP id s14mr6685149pgs.132.1543626162871; Fri, 30 Nov 2018 17:02:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543626162; cv=none; d=google.com; s=arc-20160816; b=mOyQupB3XpYU22pbNTUzZMIfZBvWMrz7AwaCpbuXMvnHSNnrvsu8SUk5wB7vE56+ZX q0pbMPjD4m3hGJLr3vweim9WlAuq9qAkT0hu2zjl9+QLcUU9p0SZqBbWnE57mLRAkgks xTGPrLIW/e9tmUE7YEP4y7TO0MFFpf3s9jL24ScGllQi6dDLF+rv5ECFsYcEC1r9Ijax ucNxlGvgPtVXxq8JUZceWuxHF35fkh4qOLrtLdfJJl19rPHekm4KQN0ia38iuL9GkCvt fIrlKSJzaME6yj9Ni5A8dd7DuDZg9/FbtVAoBbVxxfU0dryjYXXKcDj7TgkL1vyZUzYj uN7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:subject:from:references:in-reply-to :message-id:cc:to; bh=bNnlIWRtBCzqNELiYub86/+3fI4UzHqUH+UJbO5XXTk=; b=b3v3A96kTyqf6KhnxEmPYNc4faJTCBfdAH9TjNbHw/gxhaKeYG2B7C92kLUWBfEoDV iQDA9Wr3NqXvE0cdwFBfX/Whtr5a0MmSjpoRAOWosUO+tTKPzkGRl5E287A4z2Yf89HF 7o39rAG0Q2CXeGQ6T4ZocELWMDhDj7F0Qoq57f6p9w6JKPcuvqlHDidXC0LUZqs5bXiv jRt7GXjc9zxsmLT+kAoM6dE61l2e3BIfPOTcE/3jQ3jaD0I+Wuo1NdZ2yVwQRzjhNPDN eoBzJihnRa6AtEsHOtlxy/tfjXrZ6S9p8JETcYmW7fJfkVeyXyoeUWL0ieW6hSir7JPH i4aA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m3si6837854pld.331.2018.11.30.17.02.28; Fri, 30 Nov 2018 17:02:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726850AbeLAMLb (ORCPT + 99 others); Sat, 1 Dec 2018 07:11:31 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:38012 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726691AbeLAMLa (ORCPT ); Sat, 1 Dec 2018 07:11:30 -0500 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id E30B6281E7; Fri, 30 Nov 2018 20:00:14 -0500 (EST) To: Geert Uytterhoeven , Philip Blundell , Joshua Thompson Cc: Andreas Schwab , Arnd Bergmann , Stephen N Chivers , Thomas Gleixner , Kars de Jong , Daniel Lezcano , Michael Schmitz , John Stultz , Linus Walleij , linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org Message-Id: <51dd60aa18dd46d5ad250d74d5f5d1a2d2ba187c.1543625590.git.fthain@telegraphics.com.au> In-Reply-To: References: From: Finn Thain Subject: [PATCH v4 04/14] m68k: Drop ARCH_USES_GETTIMEOFFSET Date: Sat, 01 Dec 2018 11:53:10 +1100 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The functions that implement arch_gettimeoffset are re-used by new clocksource drivers in subsequent patches. Signed-off-by: Finn Thain Acked-by: Linus Walleij --- arch/m68k/Kconfig | 1 - arch/m68k/amiga/config.c | 3 --- arch/m68k/atari/config.c | 2 -- arch/m68k/bvme6000/config.c | 2 -- arch/m68k/hp300/config.c | 1 - arch/m68k/hp300/time.h | 1 - arch/m68k/mac/config.c | 3 --- arch/m68k/mvme147/config.c | 2 -- arch/m68k/mvme16x/config.c | 2 -- 9 files changed, 17 deletions(-) diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 070553791e97..cc62660a5760 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -19,7 +19,6 @@ config M68K select GENERIC_STRNCPY_FROM_USER if MMU select GENERIC_STRNLEN_USER if MMU select ARCH_WANT_IPC_PARSE_VERSION - select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_REL diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 65f63a457130..d4976c1aa0cc 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -95,8 +95,6 @@ static char amiga_model_name[13] = "Amiga "; static void amiga_sched_init(irq_handler_t handler); static void amiga_get_model(char *model); 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); static void amiga_reset(void); extern void amiga_init_sound(void); @@ -386,7 +384,6 @@ void __init config_amiga(void) mach_init_IRQ = amiga_init_IRQ; mach_get_model = amiga_get_model; 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 diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index bd96702a1ad0..89e65be2655f 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -78,7 +78,6 @@ static void atari_heartbeat(int on); /* atari specific timer functions (in time.c) */ 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_tt_hwclk (int, struct rtc_time *); @@ -205,7 +204,6 @@ void __init config_atari(void) mach_init_IRQ = atari_init_IRQ; mach_get_model = atari_get_model; mach_get_hardware_list = atari_get_hardware_list; - arch_gettimeoffset = atari_gettimeoffset; mach_reset = atari_reset; mach_max_dma_address = 0xffffff; #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP) diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 0e5efed4da86..c8b99d5516d1 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c @@ -39,7 +39,6 @@ static void bvme6000_get_model(char *model); extern void bvme6000_sched_init(irq_handler_t handler); -extern u32 bvme6000_gettimeoffset(void); extern int bvme6000_hwclk (int, struct rtc_time *); extern void bvme6000_reset (void); void bvme6000_set_vectors (void); @@ -105,7 +104,6 @@ void __init config_bvme6000(void) mach_max_dma_address = 0xffffffff; mach_sched_init = bvme6000_sched_init; mach_init_IRQ = bvme6000_init_IRQ; - arch_gettimeoffset = bvme6000_gettimeoffset; mach_hwclk = bvme6000_hwclk; mach_reset = bvme6000_reset; mach_get_model = bvme6000_get_model; diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index a19bcd23f80b..a161d44fd20b 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c @@ -254,7 +254,6 @@ void __init config_hp300(void) mach_sched_init = hp300_sched_init; mach_init_IRQ = hp300_init_IRQ; mach_get_model = hp300_get_model; - arch_gettimeoffset = hp300_gettimeoffset; mach_hwclk = hp300_hwclk; mach_get_ss = hp300_get_ss; mach_reset = hp300_reset; diff --git a/arch/m68k/hp300/time.h b/arch/m68k/hp300/time.h index f5583ec4033d..1d77b55cc72a 100644 --- a/arch/m68k/hp300/time.h +++ b/arch/m68k/hp300/time.h @@ -1,2 +1 @@ extern void hp300_sched_init(irq_handler_t vector); -extern u32 hp300_gettimeoffset(void); diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index cd9317d53276..11be08f4f750 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -54,8 +54,6 @@ struct mac_booter_data mac_bi_data; /* The phys. video addr. - might be bogus on some machines */ static unsigned long mac_orig_videoaddr; -/* Mac specific timer functions */ -extern u32 mac_gettimeoffset(void); extern int mac_hwclk(int, struct rtc_time *); extern void iop_preinit(void); extern void iop_init(void); @@ -155,7 +153,6 @@ void __init config_mac(void) mach_sched_init = mac_sched_init; mach_init_IRQ = mac_init_IRQ; mach_get_model = mac_get_model; - arch_gettimeoffset = mac_gettimeoffset; mach_hwclk = mac_hwclk; mach_reset = mac_reset; mach_halt = mac_poweroff; diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index 93c68d2b8e0e..4ef4faa5ed8b 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c @@ -38,7 +38,6 @@ static void mvme147_get_model(char *model); extern void mvme147_sched_init(irq_handler_t handler); -extern u32 mvme147_gettimeoffset(void); extern int mvme147_hwclk (int, struct rtc_time *); extern void mvme147_reset (void); @@ -84,7 +83,6 @@ void __init config_mvme147(void) mach_max_dma_address = 0x01000000; mach_sched_init = mvme147_sched_init; mach_init_IRQ = mvme147_init_IRQ; - arch_gettimeoffset = mvme147_gettimeoffset; mach_hwclk = mvme147_hwclk; mach_reset = mvme147_reset; mach_get_model = mvme147_get_model; diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index 5feb3ab484d0..3a3129e6f0bc 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -44,7 +44,6 @@ static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; static void mvme16x_get_model(char *model); extern void mvme16x_sched_init(irq_handler_t handler); -extern u32 mvme16x_gettimeoffset(void); extern int mvme16x_hwclk (int, struct rtc_time *); extern void mvme16x_reset (void); @@ -272,7 +271,6 @@ void __init config_mvme16x(void) mach_max_dma_address = 0xffffffff; mach_sched_init = mvme16x_sched_init; mach_init_IRQ = mvme16x_init_IRQ; - arch_gettimeoffset = mvme16x_gettimeoffset; mach_hwclk = mvme16x_hwclk; mach_reset = mvme16x_reset; mach_get_model = mvme16x_get_model; -- 2.18.1