From patchwork Wed Apr 27 22:34:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8963491 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC71B9F372 for ; Wed, 27 Apr 2016 22:37:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5EA0201F5 for ; Wed, 27 Apr 2016 22:37:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE0EC20155 for ; Wed, 27 Apr 2016 22:37:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753783AbcD0Whg (ORCPT ); Wed, 27 Apr 2016 18:37:36 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:56082 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753894AbcD0Wfm (ORCPT ); Wed, 27 Apr 2016 18:35:42 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Mgw4G-1bHbAm3LCi-00M4ZE; Thu, 28 Apr 2016 00:34:49 +0200 From: Arnd Bergmann To: Alexandre Belloni Cc: Arnd Bergmann , geert@linux-m68k.org, deller@gmx.de, benh@kernel.crashing.org, mpe@ellerman.id.au, dalias@libc.org, dhowells@redhat.com, linux-alpha@vger.kernel.org, a.zummo@towertech.it, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-m68k@lists.linux-m68k.org, rtc-linux@googlegroups.com, linux-arch@vger.kernel.org Subject: [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h Date: Thu, 28 Apr 2016 00:34:17 +0200 Message-Id: <1461796470-1291527-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461796470-1291527-1-git-send-email-arnd@arndb.de> References: <1461796470-1291527-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:IO1YOHRqyK4MZXxcBIhsyFhwbqFw/XypBGuGnI2njAINgZohy82 E9Yn5UoPBs08qhs+Blibug5xFG9uQENs8GxRyknYq3RqC2KW/PmUAlfeFWrtoi1SPooMAss cHz1ejKndhQvNCbM29h6pd6gsUNYJJf/NptL76BfNEn13RyrUjoAAlFQ62PmisNwqeLn3n0 A+H12sUhqymCkZXoTrfAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:6UfdcP7XGKU=:pGjQo+faqEhs4Y8eJbGfGO JJPN06KkmOED3L2KtVipoFK+mbI4ln+ANzSlFeX4abFqptXlxVfxVkq5H+GQr9YjEGRYGvqY0 mOJtyny/ybjk/g0Anj9vQvuqN4/UiqF4ZT5sgHk4jThOg5Sx37mPgT03FN2sDypq1bn/b3FFN WkrSJKkfwwDwG4AWpPkXGtgwiIP/AMUOij1yoolGa+hs1HAx9kV11SJIpPLWPuOsufPtKdsKm PhmDPOsx1gwTfpJOAdsj9FuoP5uzIAeoflJu7wh2QXocgn0kPoXytVxHn7dkldztVfNe5qZ84 EqVr+Gx+Qnw5fcIIJoNl3IexSc4U4pYYcoLfWesnxz4JWTEb84DUNiDFImXy5UCZnvRlo2MDP 9TgKTDmbG2tnWgBcHsMGgamSknuq8hbVdImuxf3Wtwy4s79r2lEhdJrNbJfI5hyDvMG/Rov6a OLmN/kDKwzf9pZlCOZ8wS8q+fyQglL/57bCanq7NWaYps7FMJ5LGJsA4Ga4eVrj85dSCITri4 qktgk+C0Y7Y3JO6adD7ZAMMxPbJ8NUgqWfEVRg41GLl0UN0WeAheVdhENXX8i8zP/hU0g0yx3 Am995t6DO89hpB0eBaj9ZNUW0pXC1lrFM+U9ISpMxuxbuEecRixvg1Fs/y9l1zKOHE0UThGsg l6edzM1FWwYe3sINbjhEZspwlDNwI63JDjSzVv1bjIvXRfwZ5HeyxrVwTQxiQyJvSU2A= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had the side-effect of unconditionally enabling the RTC_LIB symbol on x86, which in turn disables the selection of the CONFIG_RTC and CONFIG_GEN_RTC drivers that contain a two older implementations of the CONFIG_RTC_DRV_CMOS driver. This removes x86 from the list for genrtc, and changes all references to the asm/rtc.h header to instead point to the interfaces from linux/mc146818rtc.h. Signed-off-by: Arnd Bergmann --- arch/x86/include/asm/rtc.h | 1 - arch/x86/kernel/hpet.c | 3 +-- arch/x86/kernel/rtc.c | 3 +-- arch/x86/platform/efi/efi.c | 1 - drivers/acpi/acpi_cmos_rtc.c | 2 +- drivers/base/power/trace.c | 6 +++--- drivers/char/Kconfig | 2 +- drivers/rtc/rtc-mrst.c | 2 +- 8 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 arch/x86/include/asm/rtc.h diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h deleted file mode 100644 index f71c3b0ed360..000000000000 --- a/arch/x86/include/asm/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index f112af7aa62e..357900aad62c 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -1020,7 +1020,6 @@ void hpet_disable(void) */ #include #include -#include #define DEFAULT_RTC_INT_FREQ 64 #define DEFAULT_RTC_SHIFT 6 @@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) memset(&curr_time, 0, sizeof(struct rtc_time)); if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) - get_rtc_time(&curr_time); + mc146818_set_time(&curr_time); if (hpet_rtc_flags & RTC_UIE && curr_time.tm_sec != hpet_prev_update_sec) { diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index eceaa082ec3f..79c6311cd912 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #ifdef CONFIG_X86_32 @@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now) rtc_time_to_tm(nowtime, &tm); if (!rtc_valid_tm(&tm)) { - retval = set_rtc_time(&tm); + retval = mc146818_set_time(&tm); if (retval) printk(KERN_ERR "%s: RTC write failed with error %d\n", __func__, retval); diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 994a7df84a7b..13b216f71191 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #define EFI_DEBUG diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c index 81dc75033f15..0980a133916f 100644 --- a/drivers/acpi/acpi_cmos_rtc.c +++ b/drivers/acpi/acpi_cmos_rtc.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include "internal.h" diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c index a6975795e7f3..efec10b49d59 100644 --- a/drivers/base/power/trace.c +++ b/drivers/base/power/trace.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include "power.h" @@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev n /= 24; time.tm_min = (n % 20) * 3; n /= 20; - set_rtc_time(&time); + mc146818_set_time(&time); return n ? -1 : 0; } @@ -112,7 +112,7 @@ static unsigned int read_magic_time(void) struct rtc_time time; unsigned int val; - get_rtc_time(&time); + mc146818_get_time(&time); pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n", time.tm_hour, time.tm_min, time.tm_sec, time.tm_mon + 1, time.tm_mday, time.tm_year % 100); diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ca397384dc15..9bdb629fbaae 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -328,7 +328,7 @@ config JS_RTC config GEN_RTC tristate "Generic /dev/rtc emulation" depends on RTC!=y - depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86 + depends on ALPHA || M68K || MN10300 || PARISC || PPC ---help--- If you say Y here and create a character special file /dev/rtc with major number 10 and minor number 135 using mknod ("man mknod"), you diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c index 548ea6f6f384..bb8ac7c5e217 100644 --- a/drivers/rtc/rtc-mrst.c +++ b/drivers/rtc/rtc-mrst.c @@ -32,11 +32,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include