Skip to content

Commit

Permalink
vt8623fb: change option mode to mode_option
Browse files Browse the repository at this point in the history
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: 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>
  • Loading branch information
Krzysztof Helt authored and Linus Torvalds committed Apr 28, 2008
1 parent cf6d880 commit cc6c549
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/video/vt8623fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static struct svga_timing_regs vt8623_timing_regs = {

/* Module parameters */

static char *mode = "640x480-8@60";
static char *mode_option = "640x480-8@60";

#ifdef CONFIG_MTRR
static int mtrr = 1;
Expand All @@ -110,8 +110,8 @@ MODULE_AUTHOR("(c) 2006 Ondrej Zajicek <santiago@crfreenet.org>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]");

module_param(mode, charp, 0644);
MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
module_param(mode_option, charp, 0644);
MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");

#ifdef CONFIG_MTRR
module_param(mtrr, int, 0444);
Expand Down Expand Up @@ -722,10 +722,10 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi

/* 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;
}

Expand Down Expand Up @@ -913,7 +913,7 @@ static int __init vt8623fb_init(void)
return -ENODEV;

if (option && *option)
mode = option;
mode_option = option;
#endif

pr_debug("vt8623fb: initializing\n");
Expand Down

0 comments on commit cc6c549

Please sign in to comment.