diff options
Diffstat (limited to 'drivers/firmware/efivars.c')
-rw-r--r-- | drivers/firmware/efivars.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index c6281ccd4fe7..1324984a4c35 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
@@ -409,7 +409,7 @@ static struct kobj_type ktype_efivar = { | |||
409 | }; | 409 | }; |
410 | 410 | ||
411 | static ssize_t | 411 | static ssize_t |
412 | dummy(struct subsystem *sub, char *buf) | 412 | dummy(struct kset *kset, char *buf) |
413 | { | 413 | { |
414 | return -ENODEV; | 414 | return -ENODEV; |
415 | } | 415 | } |
@@ -422,7 +422,7 @@ efivar_unregister(struct efivar_entry *var) | |||
422 | 422 | ||
423 | 423 | ||
424 | static ssize_t | 424 | static ssize_t |
425 | efivar_create(struct subsystem *sub, const char *buf, size_t count) | 425 | efivar_create(struct kset *kset, const char *buf, size_t count) |
426 | { | 426 | { |
427 | struct efi_variable *new_var = (struct efi_variable *)buf; | 427 | struct efi_variable *new_var = (struct efi_variable *)buf; |
428 | struct efivar_entry *search_efivar, *n; | 428 | struct efivar_entry *search_efivar, *n; |
@@ -480,7 +480,7 @@ efivar_create(struct subsystem *sub, const char *buf, size_t count) | |||
480 | } | 480 | } |
481 | 481 | ||
482 | static ssize_t | 482 | static ssize_t |
483 | efivar_delete(struct subsystem *sub, const char *buf, size_t count) | 483 | efivar_delete(struct kset *kset, const char *buf, size_t count) |
484 | { | 484 | { |
485 | struct efi_variable *del_var = (struct efi_variable *)buf; | 485 | struct efi_variable *del_var = (struct efi_variable *)buf; |
486 | struct efivar_entry *search_efivar, *n; | 486 | struct efivar_entry *search_efivar, *n; |
@@ -551,11 +551,11 @@ static struct subsys_attribute *var_subsys_attrs[] = { | |||
551 | * the efivars driver | 551 | * the efivars driver |
552 | */ | 552 | */ |
553 | static ssize_t | 553 | static ssize_t |
554 | systab_read(struct subsystem *entry, char *buf) | 554 | systab_read(struct kset *kset, char *buf) |
555 | { | 555 | { |
556 | char *str = buf; | 556 | char *str = buf; |
557 | 557 | ||
558 | if (!entry || !buf) | 558 | if (!kset || !buf) |
559 | return -EINVAL; | 559 | return -EINVAL; |
560 | 560 | ||
561 | if (efi.mps != EFI_INVALID_TABLE_ADDR) | 561 | if (efi.mps != EFI_INVALID_TABLE_ADDR) |
@@ -687,7 +687,7 @@ efivars_init(void) | |||
687 | goto out_free; | 687 | goto out_free; |
688 | } | 688 | } |
689 | 689 | ||
690 | kset_set_kset_s(&vars_subsys, efi_subsys); | 690 | kobj_set_kset_s(&vars_subsys, efi_subsys); |
691 | 691 | ||
692 | error = subsystem_register(&vars_subsys); | 692 | error = subsystem_register(&vars_subsys); |
693 | 693 | ||