On 03/27/2016 05:08 PM, Paul Gortmaker wrote:
> The Makefile/Kconfig currently controlling compilation of this code is:
>
> obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \
>signal_64.o ptrace32.o \
>paca.o nvram_64.o firmware.o
>
> arch/powerpc/platforms/Kconfig.cputype:config PPC64
> arch/powerpc/platforms/Kconfig.cputype: bool "64-bit kernel"
>
> ...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 don't replace module.h with init.h since the file already has that.
>
> We delete the MODULE_LICENSE tag since that information is already
> contained at the top of the file in the comments.
>
> Cc: Benjamin Herrenschmidt
> Cc: Paul Mackerras
> Cc: Michael Ellerman
> Cc: Hari Bathini
> Cc: Nathan Fontenot
> Cc: Andrzej Hajda
> Cc: Anton Blanchard
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Paul Gortmaker
> ---
I think at some point in the past we thought this may be useful as a module
but I'm not sure it has ever been used that way.
Reviewed-by: Nathan Fontenot
> arch/powerpc/kernel/nvram_64.c | 12 +---
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
> index 0cab9e8c3794..856f9a7944cd 100644
> --- a/arch/powerpc/kernel/nvram_64.c
> +++ b/arch/powerpc/kernel/nvram_64.c
> @@ -15,8 +15,6 @@
> * parsing code.
> */
>
> -#include
> -
> #include
> #include
> #include
> @@ -1231,12 +1229,4 @@ static int __init nvram_init(void)
>
> return rc;
> }
> -
> -static void __exit nvram_cleanup(void)
> -{
> -misc_deregister( &nvram_dev );
> -}
> -
> -module_init(nvram_init);
> -module_exit(nvram_cleanup);
> -MODULE_LICENSE("GPL");
> +device_initcall(nvram_init);
>
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
