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: Matt Fleming <[email protected]>
Cc: Peter Jones <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
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 <[email protected]>");
MODULE_DESCRIPTION("EFI System Resource Table support");
MODULE_LICENSE("GPL");
+*/
--
2.2.1
On Tue, 25 Aug, at 07:00:48PM, Paul Gortmaker wrote:
> 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: Matt Fleming <[email protected]>
> Cc: Peter Jones <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
Looks good to me. I know Peter is on vacation right now, so I'm still
expecting a response from him. In the meantime, I'll queue this up in
the EFI 'next' branch. Thanks!
--
Matt Fleming, Intel Open Source Technology Center
On Wed, Aug 26, 2015 at 06:11:28PM +0100, Matt Fleming wrote:
> On Tue, 25 Aug, at 07:00:48PM, Paul Gortmaker wrote:
> > 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: Matt Fleming <[email protected]>
> > Cc: Peter Jones <[email protected]>
> > Cc: [email protected]
> > Signed-off-by: Paul Gortmaker <[email protected]>
>
> Looks good to me. I know Peter is on vacation right now, so I'm still
> expecting a response from him. In the meantime, I'll queue this up in
> the EFI 'next' branch. Thanks!
Looks fine to me as well.
--
Peter