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

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 61dc7cb94ffbd75ad1fc541f23799502901a6ed2..96abb23f6b426b698da666fd9a7cd585f46b904b 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -2306,49 +2306,44 @@ static struct pci_driver xgifb_driver = {
        .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_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("XGITECH , Others");
-
 module_param(mode, charp, 0);
-module_param(vesa, int, 0);
-module_param(filter, int, 0);
-module_param(forcecrt2type, charp, 0);
+MODULE_PARM_DESC(mode,
+       "\nSelects the desired default display mode in the format XxYxDepth,\n"
+       "eg. 1024x768x16.\n");
 
+module_param(forcecrt2type, charp, 0);
 MODULE_PARM_DESC(forcecrt2type,
        "\nForce the second display output type. Possible values are NONE,\n"
        "LCD, TV, VGA, SVIDEO or COMPOSITE.\n");
 
-MODULE_PARM_DESC(mode,
-       "\nSelects the desired default display mode in the format XxYxDepth,\n"
-       "eg. 1024x768x16.\n");
-
+module_param(vesa, int, 0);
 MODULE_PARM_DESC(vesa,
        "\nSelects the desired default display mode by VESA mode number, eg.\n"
        "0x117.\n");
 
+module_param(filter, int, 0);
 MODULE_PARM_DESC(filter,
-               "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n"
-               "(Possible values 0-7, default: [no filter])\n");
+       "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\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)
 {
@@ -2356,4 +2351,8 @@ static void __exit xgifb_remove_module(void)
        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);