aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-05-14 23:33:05 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2021-05-26 21:31:19 +0200
commit39aa91e2af57561716338d6488977d50b9735cfb (patch)
tree320a0ac791528bcc55bf815bf9ab1f54b38405ab /drivers/video
parentdrm/fb-helper: improve DRM fbdev emulation device names (diff)
downloadlinux-dev-39aa91e2af57561716338d6488977d50b9735cfb.tar.xz
linux-dev-39aa91e2af57561716338d6488977d50b9735cfb.zip
fbdev: matrox: use modern module_init()
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
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/matrox/matroxfb_base.c5
1 files 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);