[PATCH 30/30] ACPI-processor: Improve jump targets in acpi_processor_update_tsd_coord()

SF Markus Elfring
2016-09-10T10:12:55Z

Date: Tue, 6 Sep 2016 22:18:30 +0200

* Adjust jump targets according to the current Linux coding
style convention.

* Delete a duplicate check then.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/acpi/processor_throttling.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 79ba9b78..b45f6c3 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -97,11 +97,9 @@ static int acpi_processor_update_tsd_coord(void)
*/
if (!pthrottling->tsd_valid_flag) {
retval = -EINVAL;
- break;
+ goto free_cpumask;
}
}
- if (retval)
- goto err_ret;

for_each_possible_cpu(i) {
pr = per_cpu(processors, i);
@@ -147,12 +145,12 @@ static int acpi_processor_update_tsd_coord(void)
*/
if (match_pdomain->num_processors != count_target) {
retval = -EINVAL;
- goto err_ret;
+ goto free_cpumask;
}

if (pdomain->coord_type != match_pdomain->coord_type) {
retval = -EINVAL;
- goto err_ret;
+ goto free_cpumask;
}

cpumask_set_cpu(j, covered_cpus);
@@ -180,8 +178,7 @@ static int acpi_processor_update_tsd_coord(void)
pthrottling->shared_cpu_map);
}
}
-
-err_ret:
+ free_cpumask:
free_cpumask_var(covered_cpus);

for_each_possible_cpu(i) {
--
2.10.0