aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware/efi/esrt.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-08-25 19:00:48 -0400
committerMatt Fleming <matt.fleming@intel.com>2015-10-12 09:20:05 -0400
commit18aefbc5cc075617b00ffefba70029541e18fd1a (patch)
tree83c2c4ce0940755c438c031f866c42325b58120b /drivers/firmware/efi/esrt.c
parent0ce423b6492a02be11662bfaa837dd16945aad3e (diff)
drivers/firmware: Make efi/esrt.c driver explicitly non-modular
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>
Diffstat (limited to 'drivers/firmware/efi/esrt.c')
-rw-r--r--drivers/firmware/efi/esrt.c19
1 files 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 @@
20#include <linux/kobject.h> 20#include <linux/kobject.h>
21#include <linux/list.h> 21#include <linux/list.h>
22#include <linux/memblock.h> 22#include <linux/memblock.h>
23#include <linux/module.h>
24#include <linux/slab.h> 23#include <linux/slab.h>
25#include <linux/types.h> 24#include <linux/types.h>
26 25
@@ -450,22 +449,10 @@ err:
450 esrt = NULL; 449 esrt = NULL;
451 return error; 450 return error;
452} 451}
452device_initcall(esrt_sysfs_init);
453 453
454static void __exit esrt_sysfs_exit(void) 454/*
455{
456 pr_debug("esrt-sysfs: unloading.\n");
457 cleanup_entry_list();
458 kset_unregister(esrt_kset);
459 sysfs_remove_group(esrt_kobj, &esrt_attr_group);
460 kfree(esrt);
461 esrt = NULL;
462 kobject_del(esrt_kobj);
463 kobject_put(esrt_kobj);
464}
465
466module_init(esrt_sysfs_init);
467module_exit(esrt_sysfs_exit);
468
469MODULE_AUTHOR("Peter Jones <pjones@redhat.com>"); 455MODULE_AUTHOR("Peter Jones <pjones@redhat.com>");
470MODULE_DESCRIPTION("EFI System Resource Table support"); 456MODULE_DESCRIPTION("EFI System Resource Table support");
471MODULE_LICENSE("GPL"); 457MODULE_LICENSE("GPL");
458*/