diff options
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 72419a3b1beb..b21c2a56f960 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -285,7 +285,7 @@ decl_subsys(power,NULL,NULL); | |||
285 | * proper enumerated value, and initiates a suspend transition. | 285 | * proper enumerated value, and initiates a suspend transition. |
286 | */ | 286 | */ |
287 | 287 | ||
288 | static ssize_t state_show(struct subsystem * subsys, char * buf) | 288 | static ssize_t state_show(struct kset *kset, char *buf) |
289 | { | 289 | { |
290 | int i; | 290 | int i; |
291 | char * s = buf; | 291 | char * s = buf; |
@@ -298,7 +298,7 @@ static ssize_t state_show(struct subsystem * subsys, char * buf) | |||
298 | return (s - buf); | 298 | return (s - buf); |
299 | } | 299 | } |
300 | 300 | ||
301 | static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n) | 301 | static ssize_t state_store(struct kset *kset, const char *buf, size_t n) |
302 | { | 302 | { |
303 | suspend_state_t state = PM_SUSPEND_STANDBY; | 303 | suspend_state_t state = PM_SUSPEND_STANDBY; |
304 | const char * const *s; | 304 | const char * const *s; |
@@ -325,13 +325,13 @@ power_attr(state); | |||
325 | #ifdef CONFIG_PM_TRACE | 325 | #ifdef CONFIG_PM_TRACE |
326 | int pm_trace_enabled; | 326 | int pm_trace_enabled; |
327 | 327 | ||
328 | static ssize_t pm_trace_show(struct subsystem * subsys, char * buf) | 328 | static ssize_t pm_trace_show(struct kset *kset, char *buf) |
329 | { | 329 | { |
330 | return sprintf(buf, "%d\n", pm_trace_enabled); | 330 | return sprintf(buf, "%d\n", pm_trace_enabled); |
331 | } | 331 | } |
332 | 332 | ||
333 | static ssize_t | 333 | static ssize_t |
334 | pm_trace_store(struct subsystem * subsys, const char * buf, size_t n) | 334 | pm_trace_store(struct kset *kset, const char *buf, size_t n) |
335 | { | 335 | { |
336 | int val; | 336 | int val; |
337 | 337 | ||
@@ -365,7 +365,7 @@ static int __init pm_init(void) | |||
365 | { | 365 | { |
366 | int error = subsystem_register(&power_subsys); | 366 | int error = subsystem_register(&power_subsys); |
367 | if (!error) | 367 | if (!error) |
368 | error = sysfs_create_group(&power_subsys.kset.kobj,&attr_group); | 368 | error = sysfs_create_group(&power_subsys.kobj,&attr_group); |
369 | return error; | 369 | return error; |
370 | } | 370 | } |
371 | 371 | ||