diff options
Diffstat (limited to 'kernel/power/disk.c')
-rw-r--r-- | kernel/power/disk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 02e4fb69111a..8df51c23bba4 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
@@ -322,13 +322,13 @@ static const char * const pm_disk_modes[] = { | |||
322 | * supports it (as determined from pm_ops->pm_disk_mode). | 322 | * supports it (as determined from pm_ops->pm_disk_mode). |
323 | */ | 323 | */ |
324 | 324 | ||
325 | static ssize_t disk_show(struct subsystem * subsys, char * buf) | 325 | static ssize_t disk_show(struct kset *kset, char *buf) |
326 | { | 326 | { |
327 | return sprintf(buf, "%s\n", pm_disk_modes[pm_disk_mode]); | 327 | return sprintf(buf, "%s\n", pm_disk_modes[pm_disk_mode]); |
328 | } | 328 | } |
329 | 329 | ||
330 | 330 | ||
331 | static ssize_t disk_store(struct subsystem * s, const char * buf, size_t n) | 331 | static ssize_t disk_store(struct kset *kset, const char *buf, size_t n) |
332 | { | 332 | { |
333 | int error = 0; | 333 | int error = 0; |
334 | int i; | 334 | int i; |
@@ -373,13 +373,13 @@ static ssize_t disk_store(struct subsystem * s, const char * buf, size_t n) | |||
373 | 373 | ||
374 | power_attr(disk); | 374 | power_attr(disk); |
375 | 375 | ||
376 | static ssize_t resume_show(struct subsystem * subsys, char *buf) | 376 | static ssize_t resume_show(struct kset *kset, char *buf) |
377 | { | 377 | { |
378 | return sprintf(buf,"%d:%d\n", MAJOR(swsusp_resume_device), | 378 | return sprintf(buf,"%d:%d\n", MAJOR(swsusp_resume_device), |
379 | MINOR(swsusp_resume_device)); | 379 | MINOR(swsusp_resume_device)); |
380 | } | 380 | } |
381 | 381 | ||
382 | static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n) | 382 | static ssize_t resume_store(struct kset *kset, const char *buf, size_t n) |
383 | { | 383 | { |
384 | unsigned int maj, min; | 384 | unsigned int maj, min; |
385 | dev_t res; | 385 | dev_t res; |
@@ -405,12 +405,12 @@ static ssize_t resume_store(struct subsystem *subsys, const char *buf, size_t n) | |||
405 | 405 | ||
406 | power_attr(resume); | 406 | power_attr(resume); |
407 | 407 | ||
408 | static ssize_t image_size_show(struct subsystem * subsys, char *buf) | 408 | static ssize_t image_size_show(struct kset *kset, char *buf) |
409 | { | 409 | { |
410 | return sprintf(buf, "%lu\n", image_size); | 410 | return sprintf(buf, "%lu\n", image_size); |
411 | } | 411 | } |
412 | 412 | ||
413 | static ssize_t image_size_store(struct subsystem * subsys, const char * buf, size_t n) | 413 | static ssize_t image_size_store(struct kset *kset, const char *buf, size_t n) |
414 | { | 414 | { |
415 | unsigned long size; | 415 | unsigned long size; |
416 | 416 | ||
@@ -439,7 +439,7 @@ static struct attribute_group attr_group = { | |||
439 | 439 | ||
440 | static int __init pm_disk_init(void) | 440 | static int __init pm_disk_init(void) |
441 | { | 441 | { |
442 | return sysfs_create_group(&power_subsys.kset.kobj,&attr_group); | 442 | return sysfs_create_group(&power_subsys.kobj, &attr_group); |
443 | } | 443 | } |
444 | 444 | ||
445 | core_initcall(pm_disk_init); | 445 | core_initcall(pm_disk_init); |