[PATCH 2/4] Staging: xgifb: reorder the code a bit to be more module friendly

Greg KH gregkh at linuxfoundation.org
Tue Jun 12 00:01:51 UTC 2012


On Wed, Jun 06, 2012 at 04:22:05PM +0200, Miguel Gómez wrote:
> Signed-off-by: Miguel Gómez <magomez at igalia.com>
> ---
>  drivers/staging/xgifb/XGI_main_26.c |   51 +++++++++++++++++------------------
>  1 file changed, 25 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
> index 61dc7cb..96abb23 100644
> --- 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");

What's with these "\n" in the string?  Shouldn't those be removed?

thanks,

greg k-h



More information about the devel mailing list