aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-04-15 19:17:48 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-15 19:35:24 -0400
commit9f6a240e8b08d3fa711c2b615e7ea901cf59e590 (patch)
tree0d7583f4ab3843195413f13bfd74fba01edcebcb
parent3ac62bc0602794dc36aad77a7ef5772e989b2e22 (diff)
power: wakeup: remove use of seq_printf return value
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> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Pavel Machek <pavel@ucw.cz> Cc: Len Brown <len.brown@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/base/power/wakeup.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index aab7158d2afe..77262009f89d 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -843,7 +843,6 @@ static int print_wakeup_source_stats(struct seq_file *m,
843 unsigned long active_count; 843 unsigned long active_count;
844 ktime_t active_time; 844 ktime_t active_time;
845 ktime_t prevent_sleep_time; 845 ktime_t prevent_sleep_time;
846 int ret;
847 846
848 spin_lock_irqsave(&ws->lock, flags); 847 spin_lock_irqsave(&ws->lock, flags);
849 848
@@ -866,17 +865,16 @@ static int print_wakeup_source_stats(struct seq_file *m,
866 active_time = ktime_set(0, 0); 865 active_time = ktime_set(0, 0);
867 } 866 }
868 867
869 ret = seq_printf(m, "%-12s\t%lu\t\t%lu\t\t%lu\t\t%lu\t\t" 868 seq_printf(m, "%-12s\t%lu\t\t%lu\t\t%lu\t\t%lu\t\t%lld\t\t%lld\t\t%lld\t\t%lld\t\t%lld\n",
870 "%lld\t\t%lld\t\t%lld\t\t%lld\t\t%lld\n", 869 ws->name, active_count, ws->event_count,
871 ws->name, active_count, ws->event_count, 870 ws->wakeup_count, ws->expire_count,
872 ws->wakeup_count, ws->expire_count, 871 ktime_to_ms(active_time), ktime_to_ms(total_time),
873 ktime_to_ms(active_time), ktime_to_ms(total_time), 872 ktime_to_ms(max_time), ktime_to_ms(ws->last_time),
874 ktime_to_ms(max_time), ktime_to_ms(ws->last_time), 873 ktime_to_ms(prevent_sleep_time));
875 ktime_to_ms(prevent_sleep_time));
876 874
877 spin_unlock_irqrestore(&ws->lock, flags); 875 spin_unlock_irqrestore(&ws->lock, flags);
878 876
879 return ret; 877 return 0;
880} 878}
881 879
882/** 880/**