From patchwork Tue Apr 26 21:52:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 615363 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qvcbN55nwz9t5g for ; Wed, 27 Apr 2016 08:05:20 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3qvcbN4LD1zDrP3 for ; Wed, 27 Apr 2016 08:05:20 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3qvcS610rwzDqfG for ; Wed, 27 Apr 2016 07:59:01 +1000 (AEST) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0MCfv0-1b3O6S2sks-009Oq4; Tue, 26 Apr 2016 23:52:42 +0200 From: Arnd Bergmann To: Alexandre Belloni Subject: [PATCH v2 1/6] rtc: m68k: provide rtc_class_ops directly Date: Tue, 26 Apr 2016 23:52:26 +0200 Message-Id: <1461707551-1337971-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461707551-1337971-1-git-send-email-arnd@arndb.de> References: <1461707551-1337971-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:umHbvw3BrrmVGhUeJRiTj40axPEgiQYTRd8evKw0atZKkXncTLy Zlprx1JQdwFocxBJH2grNRZHRSDNddfESyvAHvMcxbiUjNK1dP/rDjiuFzUxeG7flpFuiq3 BMlYm30AU1gIgoyAbxS6SlyGxgW5FQydt2w9U5EF4gDBqZ6kBmwwBMQjYOuzAn5UuseKuWi TG73vsH+B3ixHp1wsxVfw== X-UI-Out-Filterresults: notjunk:1; V01:K0:dJ9iUYXU6Mo=:EUqPlwZ49JwMi/2i+t0Fg5 BSyzkCTkghSfBNwKaq5AkTIboJAA/BDVjG33cOXqwM8Gvhf6QVLdaoJQwJJVoZMgpDsQuP8x7 63o0N94yL9b816hisCNY/7nObbwRWNFamX1f/YS00KCNQeFjHsXnUWm7pQCQA9jl37kf7ktv6 FliUUVCvpzHWQW+Tqm5dar4QKylQwXT3ZCLDsEkXUB22ZngYTFCMtArIh4qKEF8uqIt8J2ETG IXBVzFZqER71J28Ka4DGfZtV24jT7Natrinb7zBO5aSpfcCEtuPkPrYRR/8pIfXpbsLXnVZQb Myh0d9UXAZQ3a0DPN15MZWhWoKMEPXonUd42iuvoHj26GJb6k48vZgHjjCbV+UezQMwbkURim lbaWHEYnzfaSOwYqk2TYwYGuKRcSWHuIt2lnGZ1qhnOHJfWdQUwDRIOoOqMq8vDM/QVAykNay i1Gvkqe7epbvZYYzhi9YJ9rbDGfteCZ6vI4FoHMv8bG7JftghMRsuAiJ8VnaBMsZctiiLio5V SfgZkpKCoZIuuK2vEoOwE3mP41KoUqa89e55hSILomdiE/OxkqXT+H+BhXH6BNjfMWMXK2ric yZfqYH9t0dIMZ0/cW67E7VwxXXlydE05xh/r7JJcZSYeo7fQp7JadkbajvYtRO2CnPclXHIcm ssS0uWMTKuXGqTDPOQlj82qucnXvY65J6VLbXG8FS1B4M0engRlRuctZmyYWps6ueHA8= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, a.zummo@towertech.it, dalias@libc.org, linux-parisc@vger.kernel.org, Arnd Bergmann , linux-sh@vger.kernel.org, deller@gmx.de, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, linux-m68k@lists.linux-m68k.org, geert@linux-m68k.org, rtc-linux@googlegroups.com, linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The rtc-generic driver provides an architecture specific wrapper on top of the generic rtc_class_ops abstraction, and m68k has another abstraction on top, which is a bit silly. This changes the m68k rtc-generic device to provide its rtc_class_ops directly, to reduce the number of layers by one. Signed-off-by: Arnd Bergmann --- arch/m68k/kernel/time.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 3857737e3958..fe35890feede 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -86,7 +86,24 @@ void read_persistent_clock(struct timespec *ts) } } -#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET +#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && defined(CONFIG_RTC_DRV_GENERIC) +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm) +{ + mach_hwclk(0, tm); + return rtc_valid_tm(tm); +} + +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm) +{ + if (mach_hwclk(1, tm) < 0) + return -EOPNOTSUPP; + return 0; +} + +static const struct rtc_class_ops generic_rtc_ops = { + .read_time = rtc_generic_get_time, + .set_time = rtc_generic_set_time, +}; static int __init rtc_init(void) { @@ -95,7 +112,10 @@ static int __init rtc_init(void) if (!mach_hwclk) return -ENODEV; - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0); + /* or just call devm_rtc_device_register instead? */ + pdev = platform_device_register_data(NULL, "rtc-generic", -1, + &generic_rtc_ops, + sizeof(generic_rtc_ops)); return PTR_ERR_OR_ZERO(pdev); }