adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages 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();
#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);

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);
#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

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;
/* 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;

2
kernel/power/disk.c
View file

@ -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);

8
kernel/power/main.c
View file

@ -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);