diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-01 13:39:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 23:40:16 -0500 |
commit | 039a5dcd2fc45188a2d522df630db4f7ef903a0f (patch) | |
tree | dbadc8ef13f00f90acf3c9caad8a3834a34f6ce9 /kernel | |
parent | 7405c1e15edfe43b137bfbc5882f1af34d6d414d (diff) |
kset: convert /sys/power to use kset_create
Dynamically create the kset instead of declaring it statically. We also
rename power_subsys to power_kset to catch all users of the variable and
we properly export it so that people don't have to guess that it really
is present in the system.
The pseries code is wierd, why is it createing /sys/power if CONFIG_PM
is disabled? Oh well, stupid big boxes ignoring config options...
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/disk.c | 2 | ||||
-rw-r--r-- | kernel/power/main.c | 11 | ||||
-rw-r--r-- | kernel/power/power.h | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 05b64790fe83..c3f0e61365dd 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
@@ -708,7 +708,7 @@ static struct attribute_group attr_group = { | |||
708 | 708 | ||
709 | static int __init pm_disk_init(void) | 709 | static int __init pm_disk_init(void) |
710 | { | 710 | { |
711 | return sysfs_create_group(&power_subsys.kobj, &attr_group); | 711 | return sysfs_create_group(&power_kset->kobj, &attr_group); |
712 | } | 712 | } |
713 | 713 | ||
714 | core_initcall(pm_disk_init); | 714 | core_initcall(pm_disk_init); |
diff --git a/kernel/power/main.c b/kernel/power/main.c index 1ef31c91ce0e..dce2d76d66de 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -276,8 +276,7 @@ EXPORT_SYMBOL(pm_suspend); | |||
276 | 276 | ||
277 | #endif /* CONFIG_SUSPEND */ | 277 | #endif /* CONFIG_SUSPEND */ |
278 | 278 | ||
279 | decl_subsys(power, NULL); | 279 | struct kset *power_kset; |
280 | |||
281 | 280 | ||
282 | /** | 281 | /** |
283 | * state - control system power state. | 282 | * state - control system power state. |
@@ -386,10 +385,10 @@ static struct attribute_group attr_group = { | |||
386 | 385 | ||
387 | static int __init pm_init(void) | 386 | static int __init pm_init(void) |
388 | { | 387 | { |
389 | int error = subsystem_register(&power_subsys); | 388 | power_kset = kset_create_and_add("power", NULL, NULL); |
390 | if (!error) | 389 | if (!power_kset) |
391 | error = sysfs_create_group(&power_subsys.kobj,&attr_group); | 390 | return -ENOMEM; |
392 | return error; | 391 | return sysfs_create_group(&power_kset->kobj, &attr_group); |
393 | } | 392 | } |
394 | 393 | ||
395 | core_initcall(pm_init); | 394 | core_initcall(pm_init); |
diff --git a/kernel/power/power.h b/kernel/power/power.h index 195dc4611764..1083e6b188ab 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h | |||
@@ -63,8 +63,6 @@ static struct subsys_attribute _name##_attr = { \ | |||
63 | .store = _name##_store, \ | 63 | .store = _name##_store, \ |
64 | } | 64 | } |
65 | 65 | ||
66 | extern struct kset power_subsys; | ||
67 | |||
68 | /* Preferred image size in bytes (default 500 MB) */ | 66 | /* Preferred image size in bytes (default 500 MB) */ |
69 | extern unsigned long image_size; | 67 | extern unsigned long image_size; |
70 | extern int in_suspend; | 68 | extern int in_suspend; |