diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2012-01-10 02:59:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 15:49:43 -0800 |
| commit | 024f78462c3da710642a54939888a92e28704653 (patch) | |
| tree | 6ff97e571b36d66256d09cf06031b56ce789ec7e /drivers/base | |
| parent | 4f58cb90bcb04cfe18f524d1c9a65edef5eb3f51 (diff) | |
| download | linux-024f78462c3da710642a54939888a92e28704653.tar.gz linux-024f78462c3da710642a54939888a92e28704653.tar.bz2 linux-024f78462c3da710642a54939888a92e28704653.zip | |
cpu: Do not return errors from cpu_dev_init() which will be ignored
cpu_dev_init() is only called from driver_init(), which does not check
its return value. Therefore make cpu_dev_init() return void.
We must register the CPU subsystem, so panic if this fails.
If sched_create_sysfs_power_savings_entries() fails, the damage is
contained, so ignore this (as before).
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/base.h | 2 | ||||
| -rw-r--r-- | drivers/base/cpu.c | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index 7a6ae4228761..b858dfd9a37c 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -94,7 +94,7 @@ extern int hypervisor_init(void); static inline int hypervisor_init(void) { return 0; } #endif extern int platform_bus_init(void); -extern int cpu_dev_init(void); +extern void cpu_dev_init(void); extern int bus_add_device(struct device *dev); extern void bus_probe_device(struct device *dev); diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 9a5578efbc93..bba70d08be6a 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -2,6 +2,7 @@ * CPU subsystem support */ +#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> #include <linux/sched.h> @@ -274,16 +275,12 @@ bool cpu_is_hotpluggable(unsigned cpu) } EXPORT_SYMBOL_GPL(cpu_is_hotpluggable); -int __init cpu_dev_init(void) +void __init cpu_dev_init(void) { - int err; - - err = subsys_system_register(&cpu_subsys, cpu_root_attr_groups); - if (err) - return err; + if (subsys_system_register(&cpu_subsys, cpu_root_attr_groups)) + panic("Failed to register CPU subsystem"); #if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT) - err = sched_create_sysfs_power_savings_entries(cpu_subsys.dev_root); + sched_create_sysfs_power_savings_entries(cpu_subsys.dev_root); #endif - return err; } |