Skip to content

Commit

Permalink
pm3fb: possible cleanups
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jul 17, 2007
1 parent a58d67c commit b309c05
Showing 1 changed file with 2 additions and 27 deletions.
29 changes: 2 additions & 27 deletions drivers/video/pm3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,6 @@ static void pm3fb_write_mode(struct fb_info *info)
/*
* hardware independent functions
*/
int pm3fb_init(void);

static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
{
u32 lpitch;
Expand Down Expand Up @@ -1170,35 +1168,12 @@ static struct pci_driver pm3fb_driver = {

MODULE_DEVICE_TABLE(pci, pm3fb_id_table);

#ifndef MODULE
/*
* 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)
static int __init pm3fb_init(void)
{
/* 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
char *option = NULL;

if (fb_get_options("pm3fb", &option))
if (fb_get_options("pm3fb", NULL))
return -ENODEV;
pm3fb_setup(option);
#endif

return pci_register_driver(&pm3fb_driver);
}

Expand Down

0 comments on commit b309c05

Please sign in to comment.