arm64: remove return value form psci_init()

psci_init() is written to return err code if something goes wrong. However,
the single user, setup_arch(), doesn't care about it. Moreover, every error
path is supplied with a clear message which is enough for pleasant debugging.

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h
index e5312ea0ec1a59bdd92934926da81155a6ce3e12..d15ab8b463360869553f4ecfa4cc255d4c8455e3 100644 (file)
--- a/arch/arm64/include/asm/psci.h
+++ b/arch/arm64/include/asm/psci.h
@@ -14,6 +14,6 @@
 #ifndef __ASM_PSCI_H
 #define __ASM_PSCI_H
 
-int psci_init(void);
+void psci_init(void);
 
 #endif /* __ASM_PSCI_H */

diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 83ebee880d19ef9f47a15c133745c0cf30e054dd..ea4828a4aa96729993d85145603ed45afba7ac03 100644 (file)
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -176,22 +176,20 @@ static const struct of_device_id psci_of_match[] __initconst = {
        {},
 };
 
-int __init psci_init(void)
+void __init psci_init(void)
 {
        struct device_node *np;
        const char *method;
        u32 id;
-       int err = 0;
 
        np = of_find_matching_node(NULL, psci_of_match);
        if (!np)
-               return -ENODEV;
+               return;
 
        pr_info("probing function IDs from device-tree\n");
 
        if (of_property_read_string(np, "method", &method)) {
                pr_warning("missing \"method\" property\n");
-               err = -ENXIO;
                goto out_put_node;
        }
 
@@ -201,7 +199,6 @@ int __init psci_init(void)
                invoke_psci_fn = __invoke_psci_fn_smc;
        } else {
                pr_warning("invalid \"method\" property: %s\n", method);
-               err = -EINVAL;
                goto out_put_node;
        }
 
@@ -227,7 +224,7 @@ int __init psci_init(void)
 
 out_put_node:
        of_node_put(np);
-       return err;
+       return;
 }
 
 #ifdef CONFIG_SMP