mirror of https://gitee.com/openkylin/linux.git
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
66ac831e03
commit
851324c6ff
|
@ -69,14 +69,14 @@ static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
|
||||||
|
|
||||||
static unsigned short enable_dyn_sleep = 1;
|
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);
|
return sprintf(buf, "%hu\n", enable_dyn_sleep);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,
|
static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,
|
||||||
const char * buf,
|
const char * buf, size_t n)
|
||||||
size_t n)
|
|
||||||
{
|
{
|
||||||
unsigned short value;
|
unsigned short value;
|
||||||
if (sscanf(buf, "%hu", &value) != 1 ||
|
if (sscanf(buf, "%hu", &value) != 1 ||
|
||||||
|
@ -88,14 +88,8 @@ static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct subsys_attribute sleep_while_idle_attr = {
|
static struct kobj_attribute sleep_while_idle_attr =
|
||||||
.attr = {
|
__ATTR(sleep_while_idle, 0644, idle_show, idle_store);
|
||||||
.name = __stringify(sleep_while_idle),
|
|
||||||
.mode = 0644,
|
|
||||||
},
|
|
||||||
.show = omap_pm_sleep_while_idle_show,
|
|
||||||
.store = omap_pm_sleep_while_idle_store,
|
|
||||||
};
|
|
||||||
|
|
||||||
static void (*omap_sram_idle)(void) = NULL;
|
static void (*omap_sram_idle)(void) = NULL;
|
||||||
static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = 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();
|
omap_pm_init_proc();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
error = subsys_create_file(power_kset, &sleep_while_idle_attr);
|
error = sysfs_create_file(&power_kset->kobj, &sleep_while_idle_attr);
|
||||||
if (error)
|
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()) {
|
if (cpu_is_omap16xx()) {
|
||||||
/* configure LOW_PWR pin */
|
/* configure LOW_PWR pin */
|
||||||
|
|
Loading…
Reference in New Issue