lkml.org 
[lkml]   [2021]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] fbdev: matrox: use modern module_init()
From
Date


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

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-05-26 21:33    [W:0.244 / U:0.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site