luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver core: make /sys/power a kobject

Browse Source 
/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>
This commit is contained in:
Greg Kroah-Hartman 2007-11-27 11:28:26 -08:00
parent 37b0c02034
commit d76e15fb20
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/pm.c
View File

@ -719,7 +719,7 @@ static int __init omap_pm_init(void)
omap_pm_init_proc(); omap_pm_init_proc();
#endif #endif
error = sysfs_create_file(&power_kset->kobj, &sleep_while_idle_attr); error = sysfs_create_file(power_kobj, &sleep_while_idle_attr);
if (error) if (error)
printk(KERN_ERR "sysfs_create_file failed: %d\n", error); printk(KERN_ERR "sysfs_create_file failed: %d\n", error);

10
arch/powerpc/platforms/pseries/power.c
View File

@ -53,7 +53,7 @@ static struct kobj_attribute auto_poweron_attr =
__ATTR(auto_poweron, 0644, auto_poweron_show, auto_poweron_store); __ATTR(auto_poweron, 0644, auto_poweron_show, auto_poweron_store);
#ifndef CONFIG_PM #ifndef CONFIG_PM
struct kset *power_kset; struct kobject *power_kobj;
static struct attribute *g[] = { static struct attribute *g[] = {
&auto_poweron_attr.attr, &auto_poweron_attr.attr,
@ -66,16 +66,16 @@ static struct attribute_group attr_group = {
static int __init pm_init(void) static int __init pm_init(void)
{ {
power_kset = kset_create_and_add("power", NULL, NULL); power_kobj = kobject_create_and_add("power", NULL);
if (!power_kset) if (!power_kobj)
return -ENOMEM; return -ENOMEM;
return sysfs_create_group(&power_kset->kobj, &attr_group); return sysfs_create_group(power_kobj, &attr_group);
} }
core_initcall(pm_init); core_initcall(pm_init);
#else #else
static int __init apo_pm_init(void) 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); __initcall(apo_pm_init);
#endif #endif

4
include/linux/kobject.h
View File

@ -202,8 +202,8 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);
extern struct kobject *kernel_kobj; extern struct kobject *kernel_kobj;
/* The global /sys/hypervisor/ kobject for people to chain off of */ /* The global /sys/hypervisor/ kobject for people to chain off of */
extern struct kobject *hypervisor_kobj; extern struct kobject *hypervisor_kobj;
/* The global /sys/power/ kset for people to chain off of */ /* The global /sys/power/ kobject for people to chain off of */
extern struct kset *power_kset; extern struct kobject *power_kobj;
/* The global /sys/firmware/ kobject for people to chain off of */ /* The global /sys/firmware/ kobject for people to chain off of */
extern struct kobject *firmware_kobj; extern struct kobject *firmware_kobj;

2
kernel/power/disk.c
View File

@ -714,7 +714,7 @@ static struct attribute_group attr_group = {
static int __init pm_disk_init(void) 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); core_initcall(pm_disk_init);

8
kernel/power/main.c
View File

@ -276,7 +276,7 @@ EXPORT_SYMBOL(pm_suspend);
#endif /* CONFIG_SUSPEND */ #endif /* CONFIG_SUSPEND */
struct kset *power_kset; struct kobject *power_kobj;
/** /**
* state - control system power state. * state - control system power state.
@ -389,10 +389,10 @@ static struct attribute_group attr_group = {
static int __init pm_init(void) static int __init pm_init(void)
{ {
power_kset = kset_create_and_add("power", NULL, NULL); power_kobj = kobject_create_and_add("power", NULL);
if (!power_kset) if (!power_kobj)
return -ENOMEM; return -ENOMEM;
return sysfs_create_group(&power_kset->kobj, &attr_group); return sysfs_create_group(power_kobj, &attr_group);
} }
core_initcall(pm_init); core_initcall(pm_init);