diff mbox

[1/2] soc: fsl: make it explicitly non-modular

Message ID 1479314367-9169-1-git-send-email-sudeep.holla@arm.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Sudeep Holla Nov. 16, 2016, 4:39 p.m. UTC
The Kconfig currently controlling compilation of this code is:

drivers/soc/fsl/Kconfig:config FSL_GUTS
drivers/soc/fsl/Kconfig:   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 was not in use by this code, the init ordering
remains unchanged with this commit.

Cc: Scott Wood <oss@buserror.net>
Cc: Yangbo Lu <yangbo.lu@nxp.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/soc/fsl/guts.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Sudeep Holla Nov. 16, 2016, 4:41 p.m. UTC | #1
On 16/11/16 16:39, Sudeep Holla wrote:
> The Kconfig currently controlling compilation of this code is:
>
> drivers/soc/fsl/Kconfig:config FSL_GUTS
> drivers/soc/fsl/Kconfig:   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 was not in use by this code, the init ordering
> remains unchanged with this commit.
>

Sorry I forgot to append -next as these are applicable only to linux-next

> Cc: Scott Wood <oss@buserror.net>
> Cc: Yangbo Lu <yangbo.lu@nxp.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  drivers/soc/fsl/guts.c | 8 --------
>  1 file changed, 8 deletions(-)
>
> diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
> index 0ac88263c2d7..885409d84eb2 100644
> --- a/drivers/soc/fsl/guts.c
> +++ b/drivers/soc/fsl/guts.c
> @@ -11,7 +11,6 @@
>
>  #include <linux/io.h>
>  #include <linux/slab.h>
> -#include <linux/module.h>
>  #include <linux/of_fdt.h>
>  #include <linux/sys_soc.h>
>  #include <linux/of_address.h>
> @@ -212,7 +211,6 @@ static const struct of_device_id fsl_guts_of_match[] = {
>  	{ .compatible = "fsl,ls2080a-dcfg", },
>  	{}
>  };
> -MODULE_DEVICE_TABLE(of, fsl_guts_of_match);
>
>  static struct platform_driver fsl_guts_driver = {
>  	.driver = {
> @@ -228,9 +226,3 @@ static int __init fsl_guts_init(void)
>  	return platform_driver_register(&fsl_guts_driver);
>  }
>  core_initcall(fsl_guts_init);
> -
> -static void __exit fsl_guts_exit(void)
> -{
> -	platform_driver_unregister(&fsl_guts_driver);
> -}
> -module_exit(fsl_guts_exit);
>
Sudeep Holla Nov. 17, 2016, 11:48 a.m. UTC | #2
On 16/11/16 16:39, Sudeep Holla wrote:
> The Kconfig currently controlling compilation of this code is:
>
> drivers/soc/fsl/Kconfig:config FSL_GUTS
> drivers/soc/fsl/Kconfig:   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 was not in use by this code, the init ordering
> remains unchanged with this commit.
>
> Cc: Scott Wood <oss@buserror.net>
> Cc: Yangbo Lu <yangbo.lu@nxp.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---

I saw Paul Gortmaker had sent similar patch on Nov 15, so drop/ignore this.
diff mbox

Patch

diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 0ac88263c2d7..885409d84eb2 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -11,7 +11,6 @@ 
 
 #include <linux/io.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/of_fdt.h>
 #include <linux/sys_soc.h>
 #include <linux/of_address.h>
@@ -212,7 +211,6 @@  static const struct of_device_id fsl_guts_of_match[] = {
 	{ .compatible = "fsl,ls2080a-dcfg", },
 	{}
 };
-MODULE_DEVICE_TABLE(of, fsl_guts_of_match);
 
 static struct platform_driver fsl_guts_driver = {
 	.driver = {
@@ -228,9 +226,3 @@  static int __init fsl_guts_init(void)
 	return platform_driver_register(&fsl_guts_driver);
 }
 core_initcall(fsl_guts_init);
-
-static void __exit fsl_guts_exit(void)
-{
-	platform_driver_unregister(&fsl_guts_driver);
-}
-module_exit(fsl_guts_exit);