Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d049053e authored by Miguel Gómez's avatar Miguel Gómez Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: reorder the code a bit to be more module friendly 



Signed-off-by: default avatarMiguel Gómez <magomez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0590773

drivers/staging/xgifb/XGI_main_26.c

+25 −26
Original line number Original line Diff line number Diff line
@@ -2306,54 +2306,53 @@ static struct pci_driver xgifb_driver = { 
	.remove = __devexit_p(xgifb_remove)

	.remove = __devexit_p(xgifb_remove)

};

};





static int __init xgifb_init(void)

{

	char *option = NULL;



	if (forcecrt2type != NULL)

		XGIfb_search_crt2type(forcecrt2type);

	if (fb_get_options("xgifb", &option))

		return -ENODEV;

	XGIfb_setup(option);



	return pci_register_driver(&xgifb_driver);

}





module_init(xgifb_init);





/*****************************************************/

/*****************************************************/

/*                      MODULE                       */

/*                      MODULE                       */

/*****************************************************/

/*****************************************************/





MODULE_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("XGITECH , Others");



module_param(mode, charp, 0);

module_param(mode, charp, 0);

module_param(vesa, int, 0);

MODULE_PARM_DESC(mode,

module_param(filter, int, 0);

	"\nSelects the desired default display mode in the format XxYxDepth,\n"

module_param(forcecrt2type, charp, 0);

	"eg. 1024x768x16.\n");





module_param(forcecrt2type, charp, 0);

MODULE_PARM_DESC(forcecrt2type,

MODULE_PARM_DESC(forcecrt2type,

	"\nForce the second display output type. Possible values are NONE,\n"

	"\nForce the second display output type. Possible values are NONE,\n"

	"LCD, TV, VGA, SVIDEO or COMPOSITE.\n");

	"LCD, TV, VGA, SVIDEO or COMPOSITE.\n");





MODULE_PARM_DESC(mode,

module_param(vesa, int, 0);

	"\nSelects the desired default display mode in the format XxYxDepth,\n"

	"eg. 1024x768x16.\n");



MODULE_PARM_DESC(vesa,

MODULE_PARM_DESC(vesa,

	"\nSelects the desired default display mode by VESA mode number, eg.\n"

	"\nSelects the desired default display mode by VESA mode number, eg.\n"

	"0x117.\n");

	"0x117.\n");





module_param(filter, int, 0);

MODULE_PARM_DESC(filter,

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(void)

{

	char *option = NULL;



	if (forcecrt2type != NULL)

		XGIfb_search_crt2type(forcecrt2type);

	if (fb_get_options("xgifb", &option))

		return -ENODEV;

	XGIfb_setup(option);



	return pci_register_driver(&xgifb_driver);

}



static void __exit xgifb_remove_module(void)

static void __exit xgifb_remove_module(void)

{

{

	pci_unregister_driver(&xgifb_driver);

	pci_unregister_driver(&xgifb_driver);

	pr_debug("Module unloaded\n");

	pr_debug("Module unloaded\n");

}

}





MODULE_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("XGITECH , Others");

module_init(xgifb_init);

module_exit(xgifb_remove_module);
 
module_exit(xgifb_remove_module);