lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cpu: Do not return errors from cpu_dev_init() which will be ignored

Browse Source 
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>
This commit is contained in:
Ben Hutchings
2012-01-10 02:59:49 +00:00
committed by Linus Torvalds
parent 4f58cb90bc
commit 024f78462c
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/base.h
View File

@@ -94,7 +94,7 @@ extern int hypervisor_init(void);
static inline int hypervisor_init(void) { return 0; } static inline int hypervisor_init(void) { return 0; }
#endif #endif
extern int platform_bus_init(void); 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 int bus_add_device(struct device *dev);
extern void bus_probe_device(struct device *dev); extern void bus_probe_device(struct device *dev);

13
drivers/base/cpu.c
View File

@@ -2,6 +2,7 @@
* CPU subsystem support * CPU subsystem support
*/ */
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
@@ -274,16 +275,12 @@ bool cpu_is_hotpluggable(unsigned cpu)
} }
EXPORT_SYMBOL_GPL(cpu_is_hotpluggable); EXPORT_SYMBOL_GPL(cpu_is_hotpluggable);
int __init cpu_dev_init(void) void __init cpu_dev_init(void)
{ {
int err; if (subsys_system_register(&cpu_subsys, cpu_root_attr_groups))
panic("Failed to register CPU subsystem");
err = subsys_system_register(&cpu_subsys, cpu_root_attr_groups);
if (err)
return err;
#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT) #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 #endif
return err;
} }