ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function

Since the only caller of acpi_parse_gic_cpu_interface() doesn't
need the return value, make it have a void return type to avoid
introducing subtle bugs, and update the comments of the function
accordingly.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>

1 files changed, 9 insertions, 14 deletions

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index c263cbaa6484..8b839558838e 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -98,12 +98,8 @@ void __init __acpi_unmap_table(char *map, unsigned long size)
 /**
  * acpi_map_gic_cpu_interface - generates a logical cpu number
  * and map to MPIDR represented by GICC structure
- * @mpidr: CPU's hardware id to register, MPIDR represented in MADT
- * @enabled: this cpu is enabled or not
- *
- * Returns the logical cpu number which maps to MPIDR
  */
-static int __init
+static void __init
 acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
 {
         int i;
@@ -112,17 +108,17 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
 
         if (mpidr == INVALID_HWID) {
                 pr_info("Skip MADT cpu entry with invalid MPIDR\n");
-                return -EINVAL;
+                return;
         }
 
         total_cpus++;
         if (!enabled)
-                return -EINVAL;
+                return;
 
         if (enabled_cpus >=  NR_CPUS) {
                 pr_warn("NR_CPUS limit of %d reached, Processor %d/0x%llx ignored.\n",
                         NR_CPUS, total_cpus, mpidr);
-                return -EINVAL;
+                return;
         }
 
         /* Check if GICC structure of boot CPU is available in the MADT */
@@ -130,7 +126,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
                 if (bootcpu_valid) {
                         pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
                                mpidr);
-                        return -EINVAL;
+                        return;
                 }
 
                 bootcpu_valid = true;
@@ -145,28 +141,27 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
                 if (cpu_logical_map(i) == mpidr) {
                         pr_err("Firmware bug, duplicate CPU MPIDR: 0x%llx in MADT\n",
                                mpidr);
-                        return -EINVAL;
+                        return;
                 }
         }
 
         if (!acpi_psci_present())
-                return -EOPNOTSUPP;
+                return;
 
         cpu_ops[enabled_cpus] = cpu_get_ops("psci");
         /* CPU 0 was already initialized */
         if (enabled_cpus) {
                 if (!cpu_ops[enabled_cpus])
-                        return -EINVAL;
+                        return;
 
                 if (cpu_ops[enabled_cpus]->cpu_init(NULL, enabled_cpus))
-                        return -EOPNOTSUPP;
+                        return;
 
                 /* map the logical cpu id to cpu MPIDR */
                 cpu_logical_map(enabled_cpus) = mpidr;
         }
 
         enabled_cpus++;
-        return enabled_cpus;
 }
 
 static int __init