Messages in this thread Patch in this message | | | From | Rusty Russell <> | Subject | Re: [PATCH 3/15] i810: fix module_param bool abuse. | Date | Fri, 13 Jan 2012 09:27:34 +1030 |
| |
On Mon, 19 Dec 2011 23:16:04 +0000, Florian Tobias Schandinat <FlorianSchandinat@gmx.de> wrote: > On 12/15/2011 03:03 AM, Rusty Russell wrote: > > The driver says "module_param(ddc3, bool, 0);". But it's not a used > > as a bool, it's used as a count. > > > > Make it a bool. > > > > Cc: Antonino Daplas <adaplas@gmail.com> > > Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> > > Cc: linux-fbdev@vger.kernel.org > > Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> > > Applied.
Hmm, I don't see this in Linus' tree yet, and it's a context-clash pre-requisite for part of the general driver bool conversion. I want to push today since I have linux.conf.au next week, so I've split the i810 conversion into a separate patch, below.
It's been over a week in linux-next, can you push this please?
From: Rusty Russell <rusty@rustcorp.com.au> Subject: module_param: make bool parameters really bool (drivers/vidio/i810)
module_param(bool) used to counter-intuitively take an int. In fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy trick.
It's time to remove the int/unsigned int option. For this version it'll simply give a warning, but it'll break next kernel version.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c @@ -135,8 +135,8 @@ static struct pci_driver i810fb_driver = static char *mode_option __devinitdata = NULL; static int vram __devinitdata = 4; static int bpp __devinitdata = 8; -static int mtrr __devinitdata; -static int accel __devinitdata; +static bool mtrr __devinitdata; +static bool accel __devinitdata; static int hsync1 __devinitdata; static int hsync2 __devinitdata; static int vsync1 __devinitdata; @@ -144,9 +144,9 @@ static int vsync2 __devinitdata; static int xres __devinitdata; static int yres; static int vyres __devinitdata; -static int sync __devinitdata; -static int extvga __devinitdata; -static int dcolor __devinitdata; +static bool sync __devinitdata; +static bool extvga __devinitdata; +static bool dcolor __devinitdata; static bool ddc3 __devinitdata; /*------------------------------------------------------------*/
| |