]>
Commit | Line | Data |
---|---|---|
6b87e81b GKH |
1 | From 9b4f603e7a9f4282aec451063ffbbb8bb410dcd9 Mon Sep 17 00:00:00 2001 |
2 | From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> | |
3 | Date: Wed, 15 Mar 2017 00:12:16 +0100 | |
4 | Subject: cpufreq: Fix and clean up show_cpuinfo_cur_freq() | |
5 | ||
6 | From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> | |
7 | ||
8 | commit 9b4f603e7a9f4282aec451063ffbbb8bb410dcd9 upstream. | |
9 | ||
10 | There is a missing newline in show_cpuinfo_cur_freq(), so add it, | |
11 | but while at it clean that function up somewhat too. | |
12 | ||
13 | Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> | |
14 | Acked-by: Viresh Kumar <viresh.kumar@linaro.org> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | ||
17 | --- | |
18 | drivers/cpufreq/cpufreq.c | 8 +++++--- | |
19 | 1 file changed, 5 insertions(+), 3 deletions(-) | |
20 | ||
21 | --- a/drivers/cpufreq/cpufreq.c | |
22 | +++ b/drivers/cpufreq/cpufreq.c | |
23 | @@ -680,9 +680,11 @@ static ssize_t show_cpuinfo_cur_freq(str | |
24 | char *buf) | |
25 | { | |
26 | unsigned int cur_freq = __cpufreq_get(policy); | |
27 | - if (!cur_freq) | |
28 | - return sprintf(buf, "<unknown>"); | |
29 | - return sprintf(buf, "%u\n", cur_freq); | |
30 | + | |
31 | + if (cur_freq) | |
32 | + return sprintf(buf, "%u\n", cur_freq); | |
33 | + | |
34 | + return sprintf(buf, "<unknown>\n"); | |
35 | } | |
36 | ||
37 | /** |