From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Stephen Warren <swarren@wwwdotorg.org>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Courbot <gnurou@gmail.com>
Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org,
linux-tegra@vger.kernel.org
Subject: [PATCH V2 - 08/27] rtc: Remove use of seq_printf return value
Date: Sat, 21 Feb 2015 20:02:15 -0800 [thread overview]
Message-ID: <1424577735.20944.6.camel@perches.com> (raw)
In-Reply-To: <cover.1424573328.git.joe@perches.com>
The seq_printf return value, because it's frequently misused,
will eventually be converted to void.
See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
seq_has_overflowed() and make public")
Signed-off-by: Joe Perches <joe@perches.com>
---
V2: sigh - Fix : vs ; line termination typo in rtc-tegra
drivers/rtc/rtc-cmos.c | 36 +++++++++++++++++++-----------------
drivers/rtc/rtc-ds1305.c | 6 +++---
drivers/rtc/rtc-mrst.c | 16 +++++++++-------
drivers/rtc/rtc-tegra.c | 4 +++-
4 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 5b2e761..87647f4 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -459,23 +459,25 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
/* NOTE: at least ICH6 reports battery status using a different
* (non-RTC) bit; and SQWE is ignored on many current systems.
*/
- return seq_printf(seq,
- "periodic_IRQ\t: %s\n"
- "update_IRQ\t: %s\n"
- "HPET_emulated\t: %s\n"
- // "square_wave\t: %s\n"
- "BCD\t\t: %s\n"
- "DST_enable\t: %s\n"
- "periodic_freq\t: %d\n"
- "batt_status\t: %s\n",
- (rtc_control & RTC_PIE) ? "yes" : "no",
- (rtc_control & RTC_UIE) ? "yes" : "no",
- is_hpet_enabled() ? "yes" : "no",
- // (rtc_control & RTC_SQWE) ? "yes" : "no",
- (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
- (rtc_control & RTC_DST_EN) ? "yes" : "no",
- cmos->rtc->irq_freq,
- (valid & RTC_VRT) ? "okay" : "dead");
+ seq_printf(seq,
+ "periodic_IRQ\t: %s\n"
+ "update_IRQ\t: %s\n"
+ "HPET_emulated\t: %s\n"
+ // "square_wave\t: %s\n"
+ "BCD\t\t: %s\n"
+ "DST_enable\t: %s\n"
+ "periodic_freq\t: %d\n"
+ "batt_status\t: %s\n",
+ (rtc_control & RTC_PIE) ? "yes" : "no",
+ (rtc_control & RTC_UIE) ? "yes" : "no",
+ is_hpet_enabled() ? "yes" : "no",
+ // (rtc_control & RTC_SQWE) ? "yes" : "no",
+ (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
+ (rtc_control & RTC_DST_EN) ? "yes" : "no",
+ cmos->rtc->irq_freq,
+ (valid & RTC_VRT) ? "okay" : "dead");
+
+ return 0;
}
#else
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 129add77..12b0715 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -434,9 +434,9 @@ static int ds1305_proc(struct device *dev, struct seq_file *seq)
}
done:
- return seq_printf(seq,
- "trickle_charge\t: %s%s\n",
- diodes, resistors);
+ seq_printf(seq, "trickle_charge\t: %s%s\n", diodes, resistors);
+
+ return 0;
}
#else
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index e2436d1..ab02bda 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -277,13 +277,15 @@ static int mrst_procfs(struct device *dev, struct seq_file *seq)
valid = vrtc_cmos_read(RTC_VALID);
spin_unlock_irq(&rtc_lock);
- return seq_printf(seq,
- "periodic_IRQ\t: %s\n"
- "alarm\t\t: %s\n"
- "BCD\t\t: no\n"
- "periodic_freq\t: daily (not adjustable)\n",
- (rtc_control & RTC_PIE) ? "on" : "off",
- (rtc_control & RTC_AIE) ? "on" : "off");
+ seq_printf(seq,
+ "periodic_IRQ\t: %s\n"
+ "alarm\t\t: %s\n"
+ "BCD\t\t: no\n"
+ "periodic_freq\t: daily (not adjustable)\n",
+ (rtc_control & RTC_PIE) ? "on" : "off",
+ (rtc_control & RTC_AIE) ? "on" : "off");
+
+ return 0;
}
#else
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index d948277..b318017 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -261,7 +261,9 @@ static int tegra_rtc_proc(struct device *dev, struct seq_file *seq)
if (!dev || !dev->driver)
return 0;
- return seq_printf(seq, "name\t\t: %s\n", dev_name(dev));
+ seq_printf(seq, "name\t\t: %s\n", dev_name(dev));
+
+ return 0;
}
static irqreturn_t tegra_rtc_irq_handler(int irq, void *data)
next prev parent reply other threads:[~2015-02-22 4:02 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-22 2:53 [PATCH 00/27] Convert seq_<foo> output calls to return void Joe Perches
2015-02-22 2:53 ` [PATCH 01/27] staging: lustre: Convert "return seq_printf(...)" uses Joe Perches
2015-02-22 2:53 ` [PATCH 02/27] staging: lustre: Convert seq_ hash functions to return void Joe Perches
2015-02-22 2:53 ` [PATCH 03/27] staging: lustre: Convert uses of "int rc = seq_printf(...)" Joe Perches
2015-03-02 1:22 ` Greg Kroah-Hartman
2015-03-02 3:58 ` [PATCH 03/27 V2] " Joe Perches
2015-02-22 2:53 ` [PATCH 04/27] staging: lustre: Convert remaining uses of "= seq_printf(...)" Joe Perches
2015-02-22 2:53 ` [PATCH 05/27] x86: mtrr: if: Remove use of seq_printf return value Joe Perches
2015-02-22 2:53 ` [PATCH 06/27] power: wakeup: " Joe Perches
2015-02-22 21:38 ` Pavel Machek
2015-02-22 21:52 ` Joe Perches
2015-02-23 11:54 ` Pavel Machek
2015-02-22 2:53 ` [PATCH 07/27] ipmi: " Joe Perches
2015-02-23 23:50 ` Andrew Morton
2015-02-24 1:23 ` Joe Perches
2015-02-22 2:53 ` [PATCH 08/27] rtc: " Joe Perches
2015-02-22 2:53 ` [PATCH 09/27] ipc: " Joe Perches
2015-02-22 2:53 ` [PATCH 10/27] pxa27x_udc: " Joe Perches
2015-02-22 10:22 ` Robert Jarzmik
2015-02-22 2:53 ` [PATCH 11/27] microblaze: mb: " Joe Perches
2015-02-23 11:39 ` Michal Simek
2015-02-22 2:53 ` [PATCH 12/27] nios2: cpuinfo: " Joe Perches
2015-02-22 2:53 ` [PATCH 13/27] ARM: plat-pxa: " Joe Perches
2015-02-22 2:53 ` [PATCH 14/27] openrisc: " Joe Perches
2015-02-22 2:53 ` [PATCH 15/27] cris: " Joe Perches
2015-02-22 2:53 ` [PATCH 16/27] mfd: ab8500-debugfs: " Joe Perches
2015-03-06 10:54 ` Lee Jones
2015-02-22 2:53 ` [PATCH 17/27] staging: i2o: " Joe Perches
2015-02-22 2:53 ` [PATCH 18/27] staging: rtl8192x: " Joe Perches
2015-02-22 2:53 ` [PATCH 19/27] s390: " Joe Perches
2015-02-22 12:53 ` Sebastian Ott
2015-02-22 2:53 ` [PATCH 20/27] i8k: " Joe Perches
2015-02-22 4:55 ` Guenter Roeck
2015-02-22 2:53 ` [PATCH 21/27] watchdog: bcm281xx: " Joe Perches
2015-02-23 19:29 ` [21/27] " Guenter Roeck
2015-03-27 7:57 ` [PATCH 21/27] " Wim Van Sebroeck
2015-02-22 2:53 ` [PATCH 22/27] proc: " Joe Perches
2015-02-22 2:53 ` [PATCH 23/27] cgroup: " Joe Perches
2015-02-22 13:41 ` Tejun Heo
2015-02-22 2:53 ` [PATCH 24/27] tracing: " Joe Perches
2015-02-22 3:54 ` Steven Rostedt
2015-02-22 4:41 ` Al Viro
2015-02-22 10:39 ` Joe Perches
2015-02-23 17:20 ` Steven Rostedt
2015-02-23 17:36 ` Joe Perches
2015-02-22 2:53 ` [PATCH 25/27] lru_cache: " Joe Perches
2015-02-22 2:53 ` [PATCH 26/27] parisc: " Joe Perches
2015-02-22 2:53 ` [PATCH 27/27] regulator: dbx500: Remove use of seq_puts/seq_printf " Joe Perches
2015-02-23 13:55 ` Mark Brown
2015-02-23 14:52 ` Joe Perches
2015-02-24 8:18 ` Mark Brown
2015-02-22 4:00 ` [PATCH V2 - 15/27] cris: Remove use of seq_printf " Joe Perches
2015-02-23 7:18 ` Jesper Nilsson
2015-02-22 4:02 ` Joe Perches [this message]
2015-02-26 12:10 ` [PATCH 11/27 v2] microblaze: mb: " Joe Perches
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=1424577735.20944.6.camel@perches.com \
--to=joe@perches.com \
--cc=a.zummo@towertech.it \
--cc=akpm@linux-foundation.org \
--cc=gnurou@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.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