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>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index b8139493b856..efc08360e627 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -276,7 +276,7 @@ EXPORT_SYMBOL(pm_suspend);
 
 #endif /* CONFIG_SUSPEND */
 
-struct kset *power_kset;
+struct kobject *power_kobj;
 
 /**
  *      state - control system power state.
@@ -389,10 +389,10 @@ 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);