* [PATCH] fbdev: matrox: use modern module_init()
@ 2021-05-14 21:33 Arnd Bergmann
2021-05-26 19:32 ` Thomas Zimmermann
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2021-05-14 21:33 UTC (permalink / raw)
To: linux-fbdev, dri-devel
Cc: Arnd Bergmann, Geert Uytterhoeven, Masahiro Yamada, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
This is one of the last drivers with a global init_module() function
instead of the modern module_init() annotation. Convert it over.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/video/fbdev/matrox/matroxfb_base.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index 4325bf7f388c..5c82611e93d9 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -2486,8 +2486,6 @@ static int __init matroxfb_init(void)
return err;
}
-module_init(matroxfb_init);
-
#else
/* *************************** init module code **************************** */
@@ -2572,7 +2570,7 @@ module_param_named(cmode, default_cmode, int, 0);
MODULE_PARM_DESC(cmode, "Specify the video depth that should be used (8bit default)");
#endif
-int __init init_module(void){
+static int __init matroxfb_init(void){
DBG(__func__)
@@ -2603,6 +2601,7 @@ int __init init_module(void){
}
#endif /* MODULE */
+module_init(matroxfb_init);
module_exit(matrox_done);
EXPORT_SYMBOL(matroxfb_register_driver);
EXPORT_SYMBOL(matroxfb_unregister_driver);
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fbdev: matrox: use modern module_init()
2021-05-14 21:33 [PATCH] fbdev: matrox: use modern module_init() Arnd Bergmann
@ 2021-05-26 19:32 ` Thomas Zimmermann
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Zimmermann @ 2021-05-26 19:32 UTC (permalink / raw)
To: Arnd Bergmann, linux-fbdev, dri-devel
Cc: Arnd Bergmann, Geert Uytterhoeven, Masahiro Yamada, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1702 bytes --]
Am 14.05.21 um 23:33 schrieb Arnd Bergmann:
> From: Arnd Bergmann <arnd@arndb.de>
>
> This is one of the last drivers with a global init_module() function
> instead of the modern module_init() annotation. Convert it over.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Added to drm-misc-next. Thank you.
Best regards
Thomas
> ---
> drivers/video/fbdev/matrox/matroxfb_base.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
> index 4325bf7f388c..5c82611e93d9 100644
> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
> @@ -2486,8 +2486,6 @@ static int __init matroxfb_init(void)
> return err;
> }
>
> -module_init(matroxfb_init);
> -
> #else
>
> /* *************************** init module code **************************** */
> @@ -2572,7 +2570,7 @@ module_param_named(cmode, default_cmode, int, 0);
> MODULE_PARM_DESC(cmode, "Specify the video depth that should be used (8bit default)");
> #endif
>
> -int __init init_module(void){
> +static int __init matroxfb_init(void){
>
> DBG(__func__)
>
> @@ -2603,6 +2601,7 @@ int __init init_module(void){
> }
> #endif /* MODULE */
>
> +module_init(matroxfb_init);
> module_exit(matrox_done);
> EXPORT_SYMBOL(matroxfb_register_driver);
> EXPORT_SYMBOL(matroxfb_unregister_driver);
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-26 19:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14 21:33 [PATCH] fbdev: matrox: use modern module_init() Arnd Bergmann
2021-05-26 19:32 ` Thomas Zimmermann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).