A Antonino A. Daplas #
Message details and related content
From: Adrian Bunk <redacted> This patch contains the following 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 <redacted> Signed-off-by: Antonino Daplas <adaplas@gmail.com> --- drivers/video/pm3fb.c | 29 ++--------------------------- 1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index a9b841c..5b3f54c 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c@@ -612,8 +612,6 @@ #endif /* ! __BIG_ENDIAN */ /* * hardware independent functions */ -int pm3fb_init(void); - static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { u32 lpitch;
@@ -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); } -------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/