s3fb: add option mode_option

Add the option "mode_option".  It also moves mtrr variable to devinitdata
section.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 7d53bc23b9c7..649cdd213d0f 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -132,10 +132,10 @@ static const struct svga_timing_regs s3_timing_regs     = {
 /* Module parameters */
 
 
-static char *mode = "640x480-8@60";
+static char *mode_option __devinitdata = "640x480-8@60";
 
 #ifdef CONFIG_MTRR
-static int mtrr = 1;
+static int mtrr __devinitdata = 1;
 #endif
 
 static int fasttext = 1;
@@ -145,8 +145,10 @@ MODULE_AUTHOR("(c) 2006-2007 Ondrej Zajicek <santiago@crfreenet.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("fbdev driver for S3 Trio/Virge");
 
-module_param(mode, charp, 0444);
-MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
+module_param(mode_option, charp, 0444);
+MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
+module_param_named(mode, mode_option, charp, 0444);
+MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc) (deprecated)");
 
 #ifdef CONFIG_MTRR
 module_param(mtrr, int, 0444);
@@ -960,10 +962,10 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         info->pseudo_palette = (void*) (par->pseudo_palette);
 
         /* Prepare startup mode */
-        rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
+        rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(&(dev->dev), "mode %s not found\n", mode);
+                dev_err(&(dev->dev), "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
@@ -1168,7 +1170,7 @@ static int  __init s3fb_setup(char *options)
                 else if (!strncmp(opt, "fasttext:", 9))
                         fasttext = simple_strtoul(opt + 9, NULL, 0);
                 else
-                        mode = opt;
+                        mode_option = opt;
         }
 
         return 0;