All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	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 v2 6/6] rtc: generic: remove get_rtc_time/set_rtc_time wrappers
Date: Tue, 26 Apr 2016 23:52:31 +0200	[thread overview]
Message-ID: <1461707551-1337971-7-git-send-email-arnd__26905.701068654$1461707661$gmane$org@arndb.de> (raw)
In-Reply-To: <1461707551-1337971-1-git-send-email-arnd@arndb.de>

All architectures using this driver are now converted to
provide their own operations, so this one can be turned
into a trivial stub driver relying on its platform data.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/rtc/rtc-generic.c | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index d726c6aa96a8..1bf5d2347928 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,44 +9,10 @@
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 
-#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
-    defined(CONFIG_PPC) || defined(CONFIG_SUPERH32)
-#include <asm/rtc.h>
-
-static int generic_get_time(struct device *dev, struct rtc_time *tm)
-{
-	unsigned int ret = get_rtc_time(tm);
-
-	if (ret & RTC_BATT_BAD)
-		return -EOPNOTSUPP;
-
-	return rtc_valid_tm(tm);
-}
-
-static int generic_set_time(struct device *dev, struct rtc_time *tm)
-{
-	if (set_rtc_time(tm) < 0)
-		return -EOPNOTSUPP;
-
-	return 0;
-}
-
-static const struct rtc_class_ops generic_rtc_ops = {
-	.read_time = generic_get_time,
-	.set_time = generic_set_time,
-};
-#else
-#define generic_rtc_ops *(struct rtc_class_ops*)NULL
-#endif
-
 static int __init generic_rtc_probe(struct platform_device *dev)
 {
 	struct rtc_device *rtc;
-	const struct rtc_class_ops *ops;
-
-	ops = dev_get_platdata(&dev->dev);
-	if (!ops)
-		ops = &generic_rtc_ops;
+	const struct rtc_class_ops *ops = dev_get_platdata(&dev->dev);
 
 	rtc = devm_rtc_device_register(&dev->dev, "rtc-generic",
 					ops, THIS_MODULE);
-- 
2.7.0

  parent reply	other threads:[~2016-04-26 21:52 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-26 21:52 [PATCH v2 0/6] simplify rtc-generic driver Arnd Bergmann
2016-04-26 21:52 ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52 ` Arnd Bergmann
2016-04-26 21:52 ` Arnd Bergmann
2016-04-26 21:52 ` [PATCH v2 1/6] rtc: m68k: provide rtc_class_ops directly Arnd Bergmann
2016-04-26 21:52 ` Arnd Bergmann
2016-04-26 21:52   ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-27  7:47   ` Geert Uytterhoeven
2016-04-27  7:47     ` [rtc-linux] " Geert Uytterhoeven
2016-04-27  7:47     ` Geert Uytterhoeven
2016-04-27  7:47     ` Geert Uytterhoeven
2016-04-27 10:34     ` Arnd Bergmann
2016-04-27 10:34       ` [rtc-linux] " Arnd Bergmann
2016-04-27 10:34       ` Arnd Bergmann
2016-04-27 10:34       ` Arnd Bergmann
2016-04-26 21:52 ` [PATCH v2 2/6] rtc: m68k: provide ioctl for q40 Arnd Bergmann
2016-04-26 21:52   ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52 ` Arnd Bergmann
2016-04-26 21:52 ` [PATCH v2 3/6] rtc: powerpc: provide rtc_class_ops directly Arnd Bergmann
2016-04-26 21:52   ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52 ` [PATCH v2 4/6] rtc: parisc: " Arnd Bergmann
2016-04-26 21:52 ` Arnd Bergmann
2016-04-26 21:52   ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-27  0:22   ` kbuild test robot
2016-04-27  0:22     ` kbuild test robot
2016-04-27  0:22     ` kbuild test robot
2016-04-27  0:22     ` [rtc-linux] " kbuild test robot
2016-04-27  0:22     ` kbuild test robot
2016-04-27  0:22     ` kbuild test robot
2016-04-27 10:10     ` Arnd Bergmann
2016-04-27 10:10       ` [rtc-linux] " Arnd Bergmann
2016-04-27 10:10       ` Arnd Bergmann
2016-04-27 10:10       ` Arnd Bergmann
2016-04-26 21:52 ` [PATCH v2 5/6] rtc: sh: " Arnd Bergmann
2016-04-26 21:52   ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52 ` Arnd Bergmann [this message]
2016-04-26 21:52 ` [PATCH v2 6/6] rtc: generic: remove get_rtc_time/set_rtc_time wrappers Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` [rtc-linux] " Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-26 21:52   ` Arnd Bergmann
2016-04-27  7:50 ` [PATCH v2 0/6] simplify rtc-generic driver Geert Uytterhoeven
2016-04-27  7:50   ` [rtc-linux] " Geert Uytterhoeven
2016-04-27  7:50   ` Geert Uytterhoeven
2016-04-27  7:50   ` Geert Uytterhoeven
2016-04-27  7:50 ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='1461707551-1337971-7-git-send-email-arnd__26905.701068654$1461707661$gmane$org@arndb.de' \
    --to=arnd@arndb.de \
    --cc=a.zummo@towertech.it \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=benh@kernel.crashing.org \
    --cc=dalias@libc.org \
    --cc=deller@gmx.de \
    --cc=dhowells@redhat.com \
    --cc=geert@linux-m68k.org \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=linux-parisc@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=rtc-linux@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.