[PATCH] mips: don't use module_init in non-modular sead3-mtd.c code

[PATCH] mips: don't use module_init in non-modular sead3-mtd.c code

[Paul Gortmaker]

The devicetree.o is built for obj-y -- and hence this code is always
present.  It will never be modular, so using module_init as an alias
for __initcall can be somewhat misleading.

Fix this up now, so that we can relocate module_init from
init.h into module.h in the future.  If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.

Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups.  As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.

We also fix a missing semicolon, which this change uncovers.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[patch will be added to init cleanup series:
   http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/  ]

 arch/mips/mti-sead3/sead3-mtd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/mips/mti-sead3/sead3-mtd.c b/arch/mips/mti-sead3/sead3-mtd.c
index ffa35f509789..f9c890d72677 100644
--- a/arch/mips/mti-sead3/sead3-mtd.c
+++ b/arch/mips/mti-sead3/sead3-mtd.c
@@ -50,5 +50,4 @@ static int __init sead3_mtd_init(void)
 
 	return 0;
 }
-
-module_init(sead3_mtd_init)
+device_initcall(sead3_mtd_init);
-- 
1.8.5.2

[PATCH] mips: don't use module_init in non-modular sead3-mtd.c code

[Paul Gortmaker]

The devicetree.o is built for obj-y -- and hence this code is always
present.  It will never be modular, so using module_init as an alias
for __initcall can be somewhat misleading.

Fix this up now, so that we can relocate module_init from
init.h into module.h in the future.  If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.

Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups.  As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.

We also fix a missing semicolon, which this change uncovers.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[patch will be added to init cleanup series:
   http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/  ]

 arch/mips/mti-sead3/sead3-mtd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/mips/mti-sead3/sead3-mtd.c b/arch/mips/mti-sead3/sead3-mtd.c
index ffa35f509789..f9c890d72677 100644
--- a/arch/mips/mti-sead3/sead3-mtd.c
+++ b/arch/mips/mti-sead3/sead3-mtd.c
@@ -50,5 +50,4 @@ static int __init sead3_mtd_init(void)
 
 	return 0;
 }
-
-module_init(sead3_mtd_init)
+device_initcall(sead3_mtd_init);
-- 
1.8.5.2

Re: [PATCH] mips: don't use module_init in non-modular sead3-mtd.c code

[Paul Gortmaker]

On 14-01-22 03:21 PM, Paul Gortmaker wrote:
> The devicetree.o is built for obj-y -- and hence this code is always

I've updated the above to correct:

   s/devicetree/sead3-mtd/

Paul.
--

> present.  It will never be modular, so using module_init as an alias
> for __initcall can be somewhat misleading.
> 
> Fix this up now, so that we can relocate module_init from
> init.h into module.h in the future.  If we don't do this, we'd
> have to add module.h to obviously non-modular code, and that
> would be a worse thing.
> 
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups.  As __initcall gets
> mapped onto device_initcall, our use of device_initcall
> directly in this change means that the runtime impact is
> zero -- it will remain at level 6 in initcall ordering.
> 
> We also fix a missing semicolon, which this change uncovers.
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: linux-mips@linux-mips.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> 
> [patch will be added to init cleanup series:
>    http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/  ]
> 
>  arch/mips/mti-sead3/sead3-mtd.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/mips/mti-sead3/sead3-mtd.c b/arch/mips/mti-sead3/sead3-mtd.c
> index ffa35f509789..f9c890d72677 100644
> --- a/arch/mips/mti-sead3/sead3-mtd.c
> +++ b/arch/mips/mti-sead3/sead3-mtd.c
> @@ -50,5 +50,4 @@ static int __init sead3_mtd_init(void)
>  
>  	return 0;
>  }
> -
> -module_init(sead3_mtd_init)
> +device_initcall(sead3_mtd_init);
> 

Re: [PATCH] mips: don't use module_init in non-modular sead3-mtd.c code

[Paul Gortmaker]

On 14-01-22 03:21 PM, Paul Gortmaker wrote:
> The devicetree.o is built for obj-y -- and hence this code is always

I've updated the above to correct:

   s/devicetree/sead3-mtd/

Paul.
--

> present.  It will never be modular, so using module_init as an alias
> for __initcall can be somewhat misleading.
> 
> Fix this up now, so that we can relocate module_init from
> init.h into module.h in the future.  If we don't do this, we'd
> have to add module.h to obviously non-modular code, and that
> would be a worse thing.
> 
> Note that direct use of __initcall is discouraged, vs. one
> of the priority categorized subgroups.  As __initcall gets
> mapped onto device_initcall, our use of device_initcall
> directly in this change means that the runtime impact is
> zero -- it will remain at level 6 in initcall ordering.
> 
> We also fix a missing semicolon, which this change uncovers.
> 
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: linux-mips@linux-mips.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> 
> [patch will be added to init cleanup series:
>    http://git.kernel.org/cgit/linux/kernel/git/paulg/init.git/  ]
> 
>  arch/mips/mti-sead3/sead3-mtd.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/mips/mti-sead3/sead3-mtd.c b/arch/mips/mti-sead3/sead3-mtd.c
> index ffa35f509789..f9c890d72677 100644
> --- a/arch/mips/mti-sead3/sead3-mtd.c
> +++ b/arch/mips/mti-sead3/sead3-mtd.c
> @@ -50,5 +50,4 @@ static int __init sead3_mtd_init(void)
>  
>  	return 0;
>  }
> -
> -module_init(sead3_mtd_init)
> +device_initcall(sead3_mtd_init);
>