Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851324c6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

kobject: convert arm/mach-omap1/pm.c to kobj_attr interface 



This makes the code a bit simpler and and gets us one step closer to
deleting the deprecated subsys_attr code.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Cliff Brake <cbrake@accelent.com>
Cc: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66ac831e

arch/arm/mach-omap1/pm.c

+8 −14
Original line number Diff line number Diff line
@@ -69,14 +69,14 @@ static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE]; 


static unsigned short enable_dyn_sleep = 1;



static ssize_t omap_pm_sleep_while_idle_show(struct kset *kset, char *buf)

static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,

			 char *buf)

{

	return sprintf(buf, "%hu\n", enable_dyn_sleep);

}



static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,

					      const char * buf,

					      size_t n)

static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,

			  const char * buf, size_t n)

{

	unsigned short value;

	if (sscanf(buf, "%hu", &value) != 1 ||
@@ -88,14 +88,8 @@ static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset, 
	return n;

}



static struct subsys_attribute sleep_while_idle_attr = {

	.attr   = {

		.name = __stringify(sleep_while_idle),

		.mode = 0644,

	},

	.show   = omap_pm_sleep_while_idle_show,

	.store  = omap_pm_sleep_while_idle_store,

};

static struct kobj_attribute sleep_while_idle_attr =

	__ATTR(sleep_while_idle, 0644, idle_show, idle_store);



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

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

#endif



	error = subsys_create_file(power_kset, &sleep_while_idle_attr);

	error = sysfs_create_file(&power_kset->kobj, &sleep_while_idle_attr);

	if (error)

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

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



	if (cpu_is_omap16xx()) {

		/* configure LOW_PWR pin */