Commit cc6c549c authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

vt8623fb: change option mode to mode_option

Change the option "mode" into "mode_option".

This is one step toward changing all fb drivers to have common "mode_option"
parameter.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf6d880c
...@@ -100,7 +100,7 @@ static struct svga_timing_regs vt8623_timing_regs = { ...@@ -100,7 +100,7 @@ static struct svga_timing_regs vt8623_timing_regs = {
/* Module parameters */ /* Module parameters */
static char *mode = "640x480-8@60"; static char *mode_option = "640x480-8@60";
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
static int mtrr = 1; static int mtrr = 1;
...@@ -110,8 +110,8 @@ MODULE_AUTHOR("(c) 2006 Ondrej Zajicek <santiago@crfreenet.org>"); ...@@ -110,8 +110,8 @@ MODULE_AUTHOR("(c) 2006 Ondrej Zajicek <santiago@crfreenet.org>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]"); MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]");
module_param(mode, charp, 0644); module_param(mode_option, charp, 0644);
MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)"); MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
module_param(mtrr, int, 0444); module_param(mtrr, int, 0444);
...@@ -722,10 +722,10 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi ...@@ -722,10 +722,10 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
/* Prepare startup mode */ /* 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))) { if (! ((rc == 1) || (rc == 2))) {
rc = -EINVAL; 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; goto err_find_mode;
} }
...@@ -913,7 +913,7 @@ static int __init vt8623fb_init(void) ...@@ -913,7 +913,7 @@ static int __init vt8623fb_init(void)
return -ENODEV; return -ENODEV;
if (option && *option) if (option && *option)
mode = option; mode_option = option;
#endif #endif
pr_debug("vt8623fb: initializing\n"); pr_debug("vt8623fb: initializing\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment