cpu: clean up register_cpu func

This patch could reduce one branch in this function. Also
make the code more readble.

Signed-off-by: Alex Shi <alex.shi@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
To: linux-kernel@vger.kernel.org
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-pm@vger.kernel.org
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 691eeea2f19a027fe01f720dbf3b139784ea4ffc..4c28e1a0978666e3f228a005661981e44205bd49 100644 (file)
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -371,12 +371,13 @@ int register_cpu(struct cpu *cpu, int num)
        if (cpu->hotpluggable)
                cpu->dev.groups = hotplugable_cpu_attr_groups;
        error = device_register(&cpu->dev);
-       if (!error)
-               per_cpu(cpu_sys_devices, num) = &cpu->dev;
-       if (!error)
-               register_cpu_under_node(num, cpu_to_node(num));
+       if (error)
+               return error;
 
-       return error;
+       per_cpu(cpu_sys_devices, num) = &cpu->dev;
+       register_cpu_under_node(num, cpu_to_node(num));
+
+       return 0;
 }
 
 struct device *get_cpu_device(unsigned cpu)