lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: xgifb: use common init for module and built-in

Browse Source 
Use a common init function for module and built-in driver.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen
2011-08-29 23:14:34 +03:00
committed by Greg Kroah-Hartman
parent 47c92d5f5f
commit b0a7928180
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/xgifb/XGI_main_26.c
View File

@@ -2479,9 +2479,7 @@ static int __init xgifb_init(void)
return pci_register_driver(&xgifb_driver); return pci_register_driver(&xgifb_driver);
} }
#ifndef MODULE
module_init(xgifb_init); module_init(xgifb_init);
#endif
/*****************************************************/ /*****************************************************/
/* MODULE */ /* MODULE */
@@ -2509,20 +2507,12 @@ MODULE_PARM_DESC(filter,
"\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n" "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n"
"(Possible values 0-7, default: [no filter])\n"); "(Possible values 0-7, default: [no filter])\n");
static int __init xgifb_init_module(void)
{
printk("\nXGIfb_init_module");
return xgifb_init();
}
static void __exit xgifb_remove_module(void) static void __exit xgifb_remove_module(void)
{ {
pci_unregister_driver(&xgifb_driver); pci_unregister_driver(&xgifb_driver);
printk(KERN_DEBUG "xgifb: Module unloaded\n"); printk(KERN_DEBUG "xgifb: Module unloaded\n");
} }
module_init(xgifb_init_module);
module_exit(xgifb_remove_module); module_exit(xgifb_remove_module);
#endif /* /MODULE */ #endif /* /MODULE */