projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3484d2
)
fbdev: matrox: use modern module_init()
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 14 May 2021 21:33:05 +0000
(23:33 +0200)
committer
Thomas Zimmermann
<tzimmermann@suse.de>
Wed, 26 May 2021 19:31:19 +0000
(21:31 +0200)
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>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link:
https://patchwork.freedesktop.org/patch/msgid/20210514213316.635070-1-arnd@kernel.org
drivers/video/fbdev/matrox/matroxfb_base.c
patch
|
blob
|
history
diff --git
a/drivers/video/fbdev/matrox/matroxfb_base.c
b/drivers/video/fbdev/matrox/matroxfb_base.c
index 4325bf7f388cbf416b169ef1678b7137bc8d9de6..5c82611e93d9950d2d6f1a44ac5d0aedc061e40a 100644
(file)
--- 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);