pm3fb: possible cleanups
- remove the empty pm3fb_setup() and corresponding code - pm3fb_init() can become static [adaplas] - retain call to fb_get_options() for global options Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a58d67ce7d
commit
b309c050cd
|
@ -612,8 +612,6 @@ static void pm3fb_write_mode(struct fb_info *info)
|
||||||
/*
|
/*
|
||||||
* hardware independent functions
|
* hardware independent functions
|
||||||
*/
|
*/
|
||||||
int pm3fb_init(void);
|
|
||||||
|
|
||||||
static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
||||||
{
|
{
|
||||||
u32 lpitch;
|
u32 lpitch;
|
||||||
|
@ -1170,35 +1168,12 @@ static struct pci_driver pm3fb_driver = {
|
||||||
|
|
||||||
MODULE_DEVICE_TABLE(pci, pm3fb_id_table);
|
MODULE_DEVICE_TABLE(pci, pm3fb_id_table);
|
||||||
|
|
||||||
#ifndef MODULE
|
static int __init pm3fb_init(void)
|
||||||
/*
|
|
||||||
* Setup
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Only necessary if your driver takes special options,
|
|
||||||
* otherwise we fall back on the generic fb_setup().
|
|
||||||
*/
|
|
||||||
static int __init pm3fb_setup(char *options)
|
|
||||||
{
|
{
|
||||||
/* Parse user speficied options (`video=pm3fb:') */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif /* MODULE */
|
|
||||||
|
|
||||||
int __init pm3fb_init(void)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* For kernel boot options (in 'video=pm3fb:<options>' format)
|
|
||||||
*/
|
|
||||||
#ifndef MODULE
|
#ifndef MODULE
|
||||||
char *option = NULL;
|
if (fb_get_options("pm3fb", NULL))
|
||||||
|
|
||||||
if (fb_get_options("pm3fb", &option))
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
pm3fb_setup(option);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return pci_register_driver(&pm3fb_driver);
|
return pci_register_driver(&pm3fb_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue