mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org,
	Alessandro Zummo <a.zummo@towertech.it>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	linux-rtc@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Joe Perches <joe@perches.com>, Mark Salyzyn <salyzyn@android.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 18/21] ds1302: Switch to use %ptR
Date: Tue, 20 Feb 2018 23:43:57 +0200	[thread overview]
Message-ID: <20180220214400.66749-19-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20180220214400.66749-1-andriy.shevchenko@linux.intel.com>

Use %ptR instead of open coded variant to print content of
struct rtc_time in human readable format.

Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/char/Kconfig  |  1 +
 drivers/char/ds1302.c | 39 ++++++++++-----------------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c96e00ebeae9..2bd83d3951c1 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -350,6 +350,7 @@ config EFI_RTC
 config DS1302
 	tristate "DS1302 RTC support"
 	depends on M32R && (PLAT_M32700UT || PLAT_OPSPUT)
+	select PRINTK_PEXT_TIMEDATE
 	help
 	  If you say Y here and create a character special file /dev/rtc with
 	  major number 121 and minor number 0 using mknod ("man mknod"), you
diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c
index 8e16ad5d6d89..1e8bd9bf4bc9 100644
--- a/drivers/char/ds1302.c
+++ b/drivers/char/ds1302.c
@@ -5,7 +5,7 @@
 *!
 *! DESCRIPTION: Implements an interface for the DS1302 RTC
 *!
-*! Functions exported: ds1302_readreg, ds1302_writereg, ds1302_init, get_rtc_status
+*! Functions exported: ds1302_readreg, ds1302_writereg, ds1302_init
 *!
 *! ---------------------------------------------------------------------------
 *!
@@ -258,31 +258,6 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 }
 
-int
-get_rtc_status(char *buf)
-{
-	char *p;
-	struct rtc_time tm;
-
-	p = buf;
-
-	get_rtc_time(&tm);
-
-	/*
-	 * There is no way to tell if the luser has the RTC set for local
-	 * time or for Universal Standard Time (GMT). Probably local though.
-	 */
-
-	p += sprintf(p,
-		"rtc_time\t: %02d:%02d:%02d\n"
-		"rtc_date\t: %04d-%02d-%02d\n",
-		tm.tm_hour, tm.tm_min, tm.tm_sec,
-		tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
-
-	return  p - buf;
-}
-
-
 /* The various file operations we support. */
 
 static const struct file_operations rtc_fops = {
@@ -299,6 +274,7 @@ static int __init
 ds1302_probe(void)
 {
 	int retval, res, baur;
+	struct rtc_time tm;
 
 	baur=(boot_cpu_data.bus_clock/(2*1000*1000));
 
@@ -317,11 +293,16 @@ ds1302_probe(void)
 
 	/* read RAM byte 0 */
 	if((res = in_byte_rtc(0xc1)) == MAGIC_PATTERN) {
-		char buf[100];
 		ds1302_wdisable();
 		printk("%s: RTC found.\n", ds1302_name);
-		get_rtc_status(buf);
-		printk(buf);
+		/*
+		 * There is no way to tell if the luser has the RTC set
+		 * for local time or for Universal Standard Time (GMT).
+		 * Probably local though.
+		 */
+		get_rtc_time(&tm);
+		printk("rtc_time\t: %ptRt\n", &tm);
+		printk("rtc_date\t: %ptRd\n", &tm);
 		retval = 1;
 	} else {
 		printk("%s: RTC not found.\n", ds1302_name);
-- 
2.15.1

  parent reply	other threads:[~2018-02-20 21:43 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-20 21:43 [PATCH v2 00/21] lib, rtc: Print rtc_time via %ptR[dt][rv] Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 01/21] lib/vsprintf: Print time and date in human readable format via %pt Andy Shevchenko
2018-02-20 23:55   ` Joe Perches
2018-02-21  7:38     ` Rasmus Villemoes
2018-02-21 13:23       ` Andy Shevchenko
2018-02-21 14:19         ` Geert Uytterhoeven
2018-02-22 12:46           ` Andy Shevchenko
2018-02-21  9:16     ` Alexandre Belloni
2018-02-21 13:19     ` Andy Shevchenko
2018-02-21  9:33   ` Geert Uytterhoeven
2018-02-21 14:02     ` Andy Shevchenko
2018-02-21 14:05       ` Andy Shevchenko
2018-03-14 16:54         ` Dmitry Torokhov
2018-02-20 21:43 ` [PATCH v2 02/21] rtc: Switch to use %ptR Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 03/21] rtc: at91rm9200: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 04/21] rtc: at91sam9: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 05/21] rtc: m41t80: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 06/21] rtc: m48t59: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 07/21] rtc: mcp795: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 08/21] rtc: pcf50633: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 09/21] rtc: pic32: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 10/21] rtc: pm8xxx: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 11/21] rtc: puv3: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 12/21] rtc: rk808: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 13/21] rtc: rx6110: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 14/21] rtc: rx8025: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 15/21] rtc: s3c: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 16/21] rtc: s5m: " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 17/21] rtc: tegra: " Andy Shevchenko
2018-02-20 21:43 ` Andy Shevchenko [this message]
2018-02-20 21:43 ` [PATCH v2 19/21] Input: hp_sdc_rtc - " Andy Shevchenko
2018-02-20 21:43 ` [PATCH v2 20/21] mk68/mac: " Andy Shevchenko
2018-02-21  9:38   ` Geert Uytterhoeven
2018-02-21 14:04     ` Andy Shevchenko
2018-02-20 21:44 ` [PATCH v2 21/21] PM: " Andy Shevchenko

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=20180220214400.66749-19-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=a.zummo@towertech.it \
    --cc=akpm@linux-foundation.org \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rtc@vger.kernel.org \
    --cc=rasmus.villemoes@prevas.dk \
    --cc=salyzyn@android.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome