From patchwork Mon May 30 18:57:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102279 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1554332qge; Mon, 30 May 2016 12:02:05 -0700 (PDT) X-Received: by 10.66.152.111 with SMTP id ux15mr46456561pab.43.1464634925328; Mon, 30 May 2016 12:02:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s207si38057787pfs.76.2016.05.30.12.02.05; Mon, 30 May 2016 12:02:05 -0700 (PDT) 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 S1162110AbcE3TB7 (ORCPT + 30 others); Mon, 30 May 2016 15:01:59 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:61742 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161867AbcE3S60 (ORCPT ); Mon, 30 May 2016 14:58:26 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MIw6j-1b5WRU0k5R-002VMF; Mon, 30 May 2016 20:58:01 +0200 From: Arnd Bergmann To: Alexandre Belloni Cc: Arnd Bergmann , geert@linux-m68k.org, gregkh@linuxfoundation.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 v4 09/16] rtc: m68k: provide rtc_class_ops directly Date: Mon, 30 May 2016 20:57:57 +0200 Message-Id: <1464634684-1248135-10-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1464634684-1248135-1-git-send-email-arnd@arndb.de> References: <1464634684-1248135-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:GpdV9CX3et8CgEEilZQzNTSmbFteTLkmNnYGPio9BG6FvbFr8L4 ORlgiVpNxl9BK/GoKVtBhRlaHHSglRQuAO6do/ICzdUda4mHvcIodmQYwA6PziVEMmyk3LA nFLwwKd9SY5GQIKi6pYuHIAap3N8GICy+FbrZFh/fCE/XfwuJgZUbMOyk65CVg7gGriUjIw R2xYzJNMHvVrV7RYtSCeA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Go4laOzoi2k=:Plhf3hhn3VHlwQQq3Kz8I1 qdYgA29Tzh3tkEnDrMTgFI0fOWvaBclGR9Vn9k83PURosx5hrD+0R+2e+kG3VSQIpxbcsqRE2 pqAjx9hKs+YvVL4mcdA4nqmWgA30h6K0lP4NxBLGDlca3klTPJvGIeODG69witNUdfzcoufr4 6LNxa1mIAVnRjKkHS6DYY/N1IaAa/bBlk90sWGtOz0cgxsDukTzVgNx1b8+qIzIuolsdQPS2H Li9Rb9IDYel8/7yDyjKvK/oRYZeAIQTmj8twzHt8AZ3r295KYZnhah59NTJZZkzz526giVfHm dFOYXQWqw0r3mdTVdfueiW86+RRieXB59G/lLbc1l6wntUqqudKDQpF8Zxyr7TPYqWOwIfTub cJffAAV74PiBigATWHF5yjDT/K0ISczK45air+AMBcoj92gRuAAIfaHdWVRz8FuXc47EHZ2uz lVdsSbiZo5pFpeKW7NnnOBM2LJZVciiySS1T4NGgTIYDp2HXQ00TfoYvC7Bqrx//rASs5O6dw hfEZ0yGeKjh/J4Z6GrKUHIaiCba/RSQY2Vwuti4QL6HwT26y//Y3foJnGqsp+uw7RnKDgBsKJ s57LGK3CiKXR614w2Onhs9i3Q+8Yow02xs4AXvrvq8dGG+plAOJY1UGG8G38fLB2Tj/InLJTo 6ows7LLUdIvRMKJsR5wi0qOxnsE1u+W4ACds7P8G8sFfxaBrh/H0FWBNmY10i/HnZpik= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 23 +++++++++++++++++++++-- drivers/rtc/rtc-generic.c | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) -- 2.7.0 diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 3857737e3958..bd6417d38d5a 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) && IS_ENABLED(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,9 @@ static int __init rtc_init(void) if (!mach_hwclk) return -ENODEV; - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0); + pdev = platform_device_register_data(NULL, "rtc-generic", -1, + &generic_rtc_ops, + sizeof(generic_rtc_ops)); return PTR_ERR_OR_ZERO(pdev); } diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c index 92b5e02a3750..5c82bae73b9c 100644 --- a/drivers/rtc/rtc-generic.c +++ b/drivers/rtc/rtc-generic.c @@ -9,7 +9,7 @@ #include #include -#if defined(CONFIG_M68K) || defined(CONFIG_PPC) +#if defined(CONFIG_PPC) #include static int generic_get_time(struct device *dev, struct rtc_time *tm)