summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-27 19:28:26 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-25 04:40:25 (GMT)
commitd76e15fb20eeb7632ef38876a884fe3508b2c01d (patch)
tree5f3d63e70d8ac2365ee0c3f6b0489c8377ec1cd0 /arch/powerpc
parent37b0c020343080241984d978981d6caf877b278a (diff)
downloadlinux-d76e15fb20eeb7632ef38876a884fe3508b2c01d.tar.xz
driver core: make /sys/power a kobject
/sys/power should not be a kset, that's overkill. This patch renames it to power_kset and fixes up all usages of it in the tree. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/pseries/power.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
index 90706cf..e95fc15 100644
--- a/arch/powerpc/platforms/pseries/power.c
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -53,7 +53,7 @@ static struct kobj_attribute auto_poweron_attr =
__ATTR(auto_poweron, 0644, auto_poweron_show, auto_poweron_store);
#ifndef CONFIG_PM
-struct kset *power_kset;
+struct kobject *power_kobj;
static struct attribute *g[] = {
&auto_poweron_attr.attr,
@@ -66,16 +66,16 @@ static struct attribute_group attr_group = {
static int __init pm_init(void)
{
- power_kset = kset_create_and_add("power", NULL, NULL);
- if (!power_kset)
+ power_kobj = kobject_create_and_add("power", NULL);
+ if (!power_kobj)
return -ENOMEM;
- return sysfs_create_group(&power_kset->kobj, &attr_group);
+ return sysfs_create_group(power_kobj, &attr_group);
}
core_initcall(pm_init);
#else
static int __init apo_pm_init(void)
{
- return (sysfs_create_file(&power_kset->kobj, &auto_poweron_attr));
+ return (sysfs_create_file(power_kobj, &auto_poweron_attr));
}
__initcall(apo_pm_init);
#endif