diff options
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index dce2d76d66de..b8139493b856 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -289,7 +289,8 @@ struct kset *power_kset; | |||
289 | * proper enumerated value, and initiates a suspend transition. | 289 | * proper enumerated value, and initiates a suspend transition. |
290 | */ | 290 | */ |
291 | 291 | ||
292 | static ssize_t state_show(struct kset *kset, char *buf) | 292 | static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr, |
293 | char *buf) | ||
293 | { | 294 | { |
294 | char *s = buf; | 295 | char *s = buf; |
295 | #ifdef CONFIG_SUSPEND | 296 | #ifdef CONFIG_SUSPEND |
@@ -310,7 +311,8 @@ static ssize_t state_show(struct kset *kset, char *buf) | |||
310 | return (s - buf); | 311 | return (s - buf); |
311 | } | 312 | } |
312 | 313 | ||
313 | static ssize_t state_store(struct kset *kset, const char *buf, size_t n) | 314 | static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr, |
315 | const char *buf, size_t n) | ||
314 | { | 316 | { |
315 | #ifdef CONFIG_SUSPEND | 317 | #ifdef CONFIG_SUSPEND |
316 | suspend_state_t state = PM_SUSPEND_STANDBY; | 318 | suspend_state_t state = PM_SUSPEND_STANDBY; |
@@ -347,13 +349,15 @@ power_attr(state); | |||
347 | #ifdef CONFIG_PM_TRACE | 349 | #ifdef CONFIG_PM_TRACE |
348 | int pm_trace_enabled; | 350 | int pm_trace_enabled; |
349 | 351 | ||
350 | static ssize_t pm_trace_show(struct kset *kset, char *buf) | 352 | static ssize_t pm_trace_show(struct kobject *kobj, struct kobj_attribute *attr, |
353 | char *buf) | ||
351 | { | 354 | { |
352 | return sprintf(buf, "%d\n", pm_trace_enabled); | 355 | return sprintf(buf, "%d\n", pm_trace_enabled); |
353 | } | 356 | } |
354 | 357 | ||
355 | static ssize_t | 358 | static ssize_t |
356 | pm_trace_store(struct kset *kset, const char *buf, size_t n) | 359 | pm_trace_store(struct kobject *kobj, struct kobj_attribute *attr, |
360 | const char *buf, size_t n) | ||
357 | { | 361 | { |
358 | int val; | 362 | int val; |
359 | 363 | ||