From: Ard Biesheuvel <ardb@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: linux-efi@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
Matthew Garrett <mjg59@google.com>,
Peter Jones <pjones@redhat.com>,
Kees Cook <keescook@chromium.org>,
Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>
Subject: [PATCH 3/7] efi: efivars: un-export efivars_sysfs_init()
Date: Wed, 23 Sep 2020 18:14:00 +0200 [thread overview]
Message-ID: <20200923161404.17811-4-ardb@kernel.org> (raw)
In-Reply-To: <20200923161404.17811-1-ardb@kernel.org>
efivars_sysfs_init() is only used locally in the source file that
defines it, so make it static and unexport it.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
drivers/firmware/efi/efivars.c | 3 +--
include/linux/efi.h | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
index f39321dbc29f..a76f50e15e6d 100644
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
@@ -638,7 +638,7 @@ static void efivars_sysfs_exit(void)
kset_unregister(efivars_kset);
}
-int efivars_sysfs_init(void)
+static int efivars_sysfs_init(void)
{
struct kobject *parent_kobj = efivars_kobject();
int error = 0;
@@ -666,7 +666,6 @@ int efivars_sysfs_init(void)
return 0;
}
-EXPORT_SYMBOL_GPL(efivars_sysfs_init);
module_init(efivars_sysfs_init);
module_exit(efivars_sysfs_exit);
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 8ae64c2a384b..7defdc456dc0 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1035,10 +1035,6 @@ bool efivar_validate(efi_guid_t vendor, efi_char16_t *var_name, u8 *data,
bool efivar_variable_is_removable(efi_guid_t vendor, const char *name,
size_t len);
-#if defined(CONFIG_EFI_VARS) || defined(CONFIG_EFI_VARS_MODULE)
-int efivars_sysfs_init(void);
-
-#endif /* CONFIG_EFI_VARS */
extern bool efi_capsule_pending(int *reset_type);
extern int efi_capsule_supported(efi_guid_t guid, u32 flags,
--
2.17.1
next prev parent reply other threads:[~2020-09-23 16:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 16:13 [PATCH 0/7] efi: deprecate/remove efivars sysfs interface Ard Biesheuvel
2020-09-23 16:13 ` [PATCH 1/7] efi: pstore: disentangle from deprecated efivars module Ard Biesheuvel
2020-09-23 18:41 ` Kees Cook
2020-09-23 18:43 ` Ard Biesheuvel
2020-09-23 21:02 ` Kees Cook
2020-09-24 9:45 ` Ard Biesheuvel
2020-09-24 10:30 ` Ard Biesheuvel
2020-09-23 16:13 ` [PATCH 2/7] efi: pstore: move workqueue handling out of efivars Ard Biesheuvel
2020-09-23 16:14 ` Ard Biesheuvel [this message]
2020-09-23 16:14 ` [PATCH 4/7] efi: gsmi: fix false dependency on CONFIG_EFI_VARS Ard Biesheuvel
2020-09-23 16:14 ` [PATCH 5/7] efi: remove some false dependencies " Ard Biesheuvel
2020-09-23 16:14 ` [PATCH 6/7] efi: efivars: limit availability to X86 builds Ard Biesheuvel
2020-09-23 16:14 ` [PATCH 7/7] efi: efivars: remove deprecated sysfs interface Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200923161404.17811-4-ardb@kernel.org \
--to=ardb@kernel.org \
--cc=anton@enomsg.org \
--cc=ccross@android.com \
--cc=keescook@chromium.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg59@google.com \
--cc=pjones@redhat.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).