Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1671333
| From | Viresh Kumar <viresh.kumar@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH V2 4/5] arch_topology: Return 0 or -ve errors from topology_parse_cpu_capacity() |
| Date | 2017-06-21 06:50 +0200 |
| Message-ID | <tUFKy-1oG-11@gated-at.bofh.it> (permalink) |
| References | <tUFKy-1oG-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Use the standard way of returning errors instead of returning 0(failure)
OR 1(success) and making it hard to read.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
arch/arm/kernel/topology.c | 2 +-
drivers/base/arch_topology.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index bf949a763dbe..a7ef4c35855e 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -111,7 +111,7 @@ static void __init parse_dt_topology(void)
continue;
}
- if (topology_parse_cpu_capacity(cn, cpu)) {
+ if (!topology_parse_cpu_capacity(cn, cpu)) {
of_node_put(cn);
continue;
}
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 07784ba666a7..ff8713b83090 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -121,11 +121,11 @@ void topology_normalize_cpu_scale(void)
int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
{
- int ret = 1;
+ int ret;
u32 cpu_capacity;
if (cap_parsing_failed)
- return !ret;
+ return -EINVAL;
ret = of_property_read_u32(cpu_node, "capacity-dmips-mhz",
&cpu_capacity);
@@ -137,7 +137,7 @@ int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
if (!raw_capacity) {
pr_err("cpu_capacity: failed to allocate memory for raw capacities\n");
cap_parsing_failed = true;
- return 0;
+ return -ENOMEM;
}
}
capacity_scale = max(cpu_capacity, capacity_scale);
@@ -154,7 +154,7 @@ int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
kfree(raw_capacity);
}
- return !ret;
+ return ret;
}
#ifdef CONFIG_CPU_FREQ
--
2.13.0.71.gd7076ec9c9cb
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH V2 0/5] arch_topology: Minor cleanups Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-21 06:50 +0200
[PATCH V2 3/5] arch_topology: Covert switch block to if block Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-21 06:50 +0200
[PATCH V2 4/5] arch_topology: Return 0 or -ve errors from topology_parse_cpu_capacity() Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-21 06:50 +0200
Re: [PATCH V2 4/5] arch_topology: Return 0 or -ve errors from topology_parse_cpu_capacity() Juri Lelli <juri.lelli@arm.com> - 2017-06-22 11:50 +0200
Re: [PATCH V2 4/5] arch_topology: Return 0 or -ve errors from topology_parse_cpu_capacity() Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-22 16:30 +0200
Re: [PATCH V2 4/5] arch_topology: Return 0 or -ve errors from topology_parse_cpu_capacity() Juri Lelli <juri.lelli@arm.com> - 2017-06-22 18:50 +0200
[PATCH V2 5/5] arch_topology: Localize cap_parsing_failed to topology_parse_cpu_capacity() Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-21 06:50 +0200
[PATCH V2 2/5] arch_topology: Don't break lines unnecessarily Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-21 06:50 +0200
[PATCH V2 1/5] arch_topology: Get rid of "cap_parsing_done" Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-21 06:50 +0200
Re: [PATCH V2 1/5] arch_topology: Get rid of "cap_parsing_done" Juri Lelli <juri.lelli@arm.com> - 2017-06-22 11:50 +0200
Re: [PATCH V2 1/5] arch_topology: Get rid of "cap_parsing_done" Viresh Kumar <viresh.kumar@linaro.org> - 2017-06-22 16:30 +0200
Re: [PATCH V2 1/5] arch_topology: Get rid of "cap_parsing_done" Juri Lelli <juri.lelli@arm.com> - 2017-06-22 18:50 +0200
csiph-web