diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2020-09-23 10:18:31 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-09-29 19:40:57 +0200 |
| commit | 9846d86031eeca2fb2867fe4ac9d92803a97e8e4 (patch) | |
| tree | 0ed94b9fa48f8c587889a01c9cd9c1cc4d207c53 /drivers/firmware/google/gsmi.c | |
| parent | 5d3c8617ccee6387ba73a5dba77fb9dc21cb85f4 (diff) | |
| download | linux-9846d86031eeca2fb2867fe4ac9d92803a97e8e4.tar.gz linux-9846d86031eeca2fb2867fe4ac9d92803a97e8e4.tar.bz2 linux-9846d86031eeca2fb2867fe4ac9d92803a97e8e4.zip | |
efi: gsmi: fix false dependency on CONFIG_EFI_VARS
The gsmi code does not actually rely on CONFIG_EFI_VARS, since it only
uses the efivars abstraction that is included unconditionally when
CONFIG_EFI is defined. CONFIG_EFI_VARS controls the inclusion of the
code that exposes the sysfs entries, and which has been deprecated for
some time.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'drivers/firmware/google/gsmi.c')
| -rw-r--r-- | drivers/firmware/google/gsmi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index 5b2011ebbe26..7d9367b22010 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c @@ -302,7 +302,7 @@ static int gsmi_exec(u8 func, u8 sub) return rc; } -#ifdef CONFIG_EFI_VARS +#ifdef CONFIG_EFI static struct efivars efivars; @@ -483,7 +483,7 @@ static const struct efivar_operations efivar_ops = { .get_next_variable = gsmi_get_next_variable, }; -#endif /* CONFIG_EFI_VARS */ +#endif /* CONFIG_EFI */ static ssize_t eventlog_write(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, @@ -1007,7 +1007,7 @@ static __init int gsmi_init(void) goto out_remove_bin_file; } -#ifdef CONFIG_EFI_VARS +#ifdef CONFIG_EFI ret = efivars_register(&efivars, &efivar_ops, gsmi_kobj); if (ret) { printk(KERN_INFO "gsmi: Failed to register efivars\n"); @@ -1047,7 +1047,7 @@ static void __exit gsmi_exit(void) unregister_die_notifier(&gsmi_die_notifier); atomic_notifier_chain_unregister(&panic_notifier_list, &gsmi_panic_notifier); -#ifdef CONFIG_EFI_VARS +#ifdef CONFIG_EFI efivars_unregister(&efivars); #endif |