From: Matt Fleming <matt@codeblueprint.co.uk> To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Peter Jones <pjones@redhat.com>, Matt Fleming <matt.fleming@intel.com> Subject: [PATCH 01/11] drivers/firmware: Make efi/esrt.c driver explicitly non-modular Date: Mon, 12 Oct 2015 14:56:04 +0100 [thread overview] Message-ID: <1444658174-23378-2-git-send-email-matt@codeblueprint.co.uk> (raw) In-Reply-To: <1444658174-23378-1-git-send-email-matt@codeblueprint.co.uk> From: Paul Gortmaker <paul.gortmaker@windriver.com> The Kconfig for this driver is currently hidden with: config EFI_ESRT bool ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We leave some tags like MODULE_AUTHOR for documentation purposes. We don't replace module.h with init.h since the file already has that. Cc: Peter Jones <pjones@redhat.com> Cc: linux-efi@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com> --- drivers/firmware/efi/esrt.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index a5b95d61ae71..22c5285f7705 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -20,7 +20,6 @@ #include <linux/kobject.h> #include <linux/list.h> #include <linux/memblock.h> -#include <linux/module.h> #include <linux/slab.h> #include <linux/types.h> @@ -450,22 +449,10 @@ err: esrt = NULL; return error; } +device_initcall(esrt_sysfs_init); -static void __exit esrt_sysfs_exit(void) -{ - pr_debug("esrt-sysfs: unloading.\n"); - cleanup_entry_list(); - kset_unregister(esrt_kset); - sysfs_remove_group(esrt_kobj, &esrt_attr_group); - kfree(esrt); - esrt = NULL; - kobject_del(esrt_kobj); - kobject_put(esrt_kobj); -} - -module_init(esrt_sysfs_init); -module_exit(esrt_sysfs_exit); - +/* MODULE_AUTHOR("Peter Jones <pjones@redhat.com>"); MODULE_DESCRIPTION("EFI System Resource Table support"); MODULE_LICENSE("GPL"); +*/ -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> To: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org> Cc: Paul Gortmaker <paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Peter Jones <pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Subject: [PATCH 01/11] drivers/firmware: Make efi/esrt.c driver explicitly non-modular Date: Mon, 12 Oct 2015 14:56:04 +0100 [thread overview] Message-ID: <1444658174-23378-2-git-send-email-matt@codeblueprint.co.uk> (raw) In-Reply-To: <1444658174-23378-1-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> From: Paul Gortmaker <paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org> The Kconfig for this driver is currently hidden with: config EFI_ESRT bool ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We leave some tags like MODULE_AUTHOR for documentation purposes. We don't replace module.h with init.h since the file already has that. Cc: Peter Jones <pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Signed-off-by: Paul Gortmaker <paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org> Signed-off-by: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> --- drivers/firmware/efi/esrt.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index a5b95d61ae71..22c5285f7705 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -20,7 +20,6 @@ #include <linux/kobject.h> #include <linux/list.h> #include <linux/memblock.h> -#include <linux/module.h> #include <linux/slab.h> #include <linux/types.h> @@ -450,22 +449,10 @@ err: esrt = NULL; return error; } +device_initcall(esrt_sysfs_init); -static void __exit esrt_sysfs_exit(void) -{ - pr_debug("esrt-sysfs: unloading.\n"); - cleanup_entry_list(); - kset_unregister(esrt_kset); - sysfs_remove_group(esrt_kobj, &esrt_attr_group); - kfree(esrt); - esrt = NULL; - kobject_del(esrt_kobj); - kobject_put(esrt_kobj); -} - -module_init(esrt_sysfs_init); -module_exit(esrt_sysfs_exit); - +/* MODULE_AUTHOR("Peter Jones <pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>"); MODULE_DESCRIPTION("EFI System Resource Table support"); MODULE_LICENSE("GPL"); +*/ -- 2.1.0
next prev parent reply other threads:[~2015-10-12 13:59 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-12 13:56 [GIT PULL 00/11] EFI changes for v4.4 Matt Fleming 2015-10-12 13:56 ` Matt Fleming [this message] 2015-10-12 13:56 ` [PATCH 01/11] drivers/firmware: Make efi/esrt.c driver explicitly non-modular Matt Fleming 2015-10-12 13:56 ` [PATCH 02/11] efi/x86: Move efi=debug option parsing to core Matt Fleming 2015-10-12 13:56 ` Matt Fleming 2015-10-12 13:56 ` [PATCH 03/11] arm64: Use core efi=debug instead of uefi_debug command line parameter Matt Fleming 2015-10-12 13:56 ` [PATCH 04/11] efi/arm64: Clean up efi_get_fdt_params() interface Matt Fleming 2015-10-12 13:56 ` [PATCH 05/11] efifb: Add support for 64-bit frame buffer addresses Matt Fleming 2015-10-12 13:56 ` [PATCH 06/11] efi: Add EFI_MEMORY_MORE_RELIABLE support to efi_md_typeattr_format() Matt Fleming 2015-10-12 13:56 ` [PATCH 07/11] efi: Add support for UEFIv2.5 Properties table Matt Fleming 2015-10-12 13:56 ` Matt Fleming 2015-10-12 13:56 ` [PATCH 08/11] efi: Introduce EFI_NX_PE_DATA bit and set it from properties table Matt Fleming 2015-10-12 13:56 ` [PATCH 09/11] efi: Auto-load the efi-pstore module Matt Fleming 2015-10-12 13:56 ` [PATCH 10/11] x86/efi: Rename print_efi_memmap() to efi_print_memmap() Matt Fleming 2015-10-12 13:56 ` [PATCH 11/11] efi: Add "efi_fake_mem" boot option Matt Fleming 2015-10-12 13:56 ` Matt Fleming 2015-10-14 15:02 ` [GIT PULL 00/11] EFI changes for v4.4 Ingo Molnar 2015-10-14 15:02 ` Ingo Molnar
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=1444658174-23378-2-git-send-email-matt@codeblueprint.co.uk \ --to=matt@codeblueprint.co.uk \ --cc=hpa@zytor.com \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=matt.fleming@intel.com \ --cc=mingo@kernel.org \ --cc=paul.gortmaker@windriver.com \ --cc=pjones@redhat.com \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.