Commit 039a5dcd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

kset: convert /sys/power to use kset_create 



Dynamically create the kset instead of declaring it statically.  We also
rename power_subsys to power_kset to catch all users of the variable and
we properly export it so that people don't have to guess that it really
is present in the system.

The pseries code is wierd, why is it createing /sys/power if CONFIG_PM
is disabled?  Oh well, stupid big boxes ignoring config options...

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7405c1e1

arch/arm/mach-omap1/pm.c

+1 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static struct subsys_attribute sleep_while_idle_attr = { 
	.store  = omap_pm_sleep_while_idle_store,

};



extern struct kset power_subsys;

static void (*omap_sram_idle)(void) = NULL;

static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
@@ -726,7 +725,7 @@ static int __init omap_pm_init(void) 
	omap_pm_init_proc();

#endif



	error = subsys_create_file(&power_subsys, &sleep_while_idle_attr);

	error = subsys_create_file(power_kset, &sleep_while_idle_attr);

	if (error)

		printk(KERN_ERR "subsys_create_file failed: %d\n", error);

arch/powerpc/platforms/pseries/power.c

+6 −8
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static struct subsys_attribute auto_poweron_attr = { 
};



#ifndef CONFIG_PM

decl_subsys(power, NULL);

struct kset *power_kset;



static struct attribute *g[] = {

        &auto_poweron_attr.attr,
@@ -70,18 +70,16 @@ static struct attribute_group attr_group = { 


static int __init pm_init(void)

{

        int error = subsystem_register(&power_subsys);

        if (!error)

                error = sysfs_create_group(&power_subsys.kobj, &attr_group);

        return error;

	power_kset = kset_create_and_add("power", NULL, NULL);

	if (!power_kset)

		return -ENOMEM;

	return sysfs_create_group(&power_kset->kobj, &attr_group);

}

core_initcall(pm_init);

#else

extern struct kset power_subsys;



static int __init apo_pm_init(void)

{

	return (subsys_create_file(&power_subsys, &auto_poweron_attr));

	return (subsys_create_file(power_kset, &auto_poweron_attr));

}

__initcall(apo_pm_init);

#endif

include/linux/kobject.h

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ struct kset _name##_subsys = { \ 
extern struct kset *kernel_kset;

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



extern int __must_check subsystem_register(struct kset *);

extern void subsystem_unregister(struct kset *);

kernel/power/disk.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static struct attribute_group attr_group = { 


static int __init pm_disk_init(void)

{

	return sysfs_create_group(&power_subsys.kobj, &attr_group);

	return sysfs_create_group(&power_kset->kobj, &attr_group);

}



core_initcall(pm_disk_init);

kernel/power/main.c

+5 −6
Original line number Diff line number Diff line
@@ -276,8 +276,7 @@ EXPORT_SYMBOL(pm_suspend); 


#endif /* CONFIG_SUSPEND */



decl_subsys(power, NULL);



struct kset *power_kset;



/**

 *	state - control system power state.
@@ -386,10 +385,10 @@ static struct attribute_group attr_group = { 


static int __init pm_init(void)

{

	int error = subsystem_register(&power_subsys);

	if (!error)

		error = sysfs_create_group(&power_subsys.kobj,&attr_group);

	return error;

	power_kset = kset_create_and_add("power", NULL, NULL);

	if (!power_kset)

		return -ENOMEM;

	return sysfs_create_group(&power_kset->kobj, &attr_group);

}



core_initcall(pm_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE