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>

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 63edafb594909f3d381ccef869a5c1f46aae5d98..d9805e3d930400de42e49afd8216e3a8c71bb745 100644 (file)
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -719,7 +719,7 @@ static int __init omap_pm_init(void)
        omap_pm_init_proc();
 #endif
 
-       error = sysfs_create_file(&power_kset->kobj, &sleep_while_idle_attr);
+       error = sysfs_create_file(power_kobj, &sleep_while_idle_attr);
        if (error)
                printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
 

diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
index 90706cf840fdd025c55cb45d8e26398602e3be6f..e95fc1594c84b0d8f76c351c459ce8b74b2db816 100644 (file)
--- 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

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 78c851b4e67e51ce706eaa85330bda5375f19d51..bb6868475edb319c76157c89e4bf94b38eb3381e 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -202,8 +202,8 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);
 extern struct kobject *kernel_kobj;
 /* The global /sys/hypervisor/ kobject for people to chain off of */
 extern struct kobject *hypervisor_kobj;
-/* The global /sys/power/ kset for people to chain off of */
-extern struct kset *power_kset;
+/* The global /sys/power/ kobject for people to chain off of */
+extern struct kobject *power_kobj;
 /* The global /sys/firmware/ kobject for people to chain off of */
 extern struct kobject *firmware_kobj;
 

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index ef5aa2ca0ab0bf9edf52e73e8fcf3b7114cc8f66..b138b431e27135aa7b2716335288069ea00beeee 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -714,7 +714,7 @@ static struct attribute_group attr_group = {
 
 static int __init pm_disk_init(void)
 {
-       return sysfs_create_group(&power_kset->kobj, &attr_group);
+       return sysfs_create_group(power_kobj, &attr_group);
 }
 
 core_initcall(pm_disk_init);

diff --git a/kernel/power/main.c b/kernel/power/main.c
index b8139493b856bcdad1ead4010efaa790a95422f4..efc08360e627199374837ed95ea31ebcd0f94a80 100644 (file)
--- 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);