Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1abf9172 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

arkfb: add option mode_option 



Add the option "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 cc6c549c

drivers/video/arkfb.c

+8 −6
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static const struct svga_timing_regs ark_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;
@@ -111,8 +111,10 @@ MODULE_AUTHOR("(c) 2007 Ondrej Zajicek <santiago@crfreenet.org>"); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("fbdev driver for ARK 2000PV");



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);
@@ -999,10 +1001,10 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ 
	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;

	}
@@ -1190,7 +1192,7 @@ static int __init arkfb_init(void) 
		return -ENODEV;



	if (option && *option)

		mode = option;

		mode_option = option;

#endif



	pr_debug("arkfb: initializing\n");