Re: [PATCH 12/15] module_param: make bool parameters really bool (drivers & misc)

[Tomi Valkeinen <tomi.valkeinen@ti.com>]

[-- Attachment #1: Type: text/plain, Size: 2026 bytes --]

Hi,

On Thu, 2011-12-15 at 13:48 +1030, Rusty Russell wrote:
> 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>

The changes below break compilation for omapdss and omapfb: dss_debug
and omapfb_debug are declared in dss.h and omapfb.h, and those
declarations are not changed, resulting in conflicting types error.

Perhaps extra care should be taken in cases where the variable in
question is not declared as static.

 Tomi

> diff --git a/drivers/video/omap2/dss/core.c
> b/drivers/video/omap2/dss/core.c
> --- a/drivers/video/omap2/dss/core.c
> +++ b/drivers/video/omap2/dss/core.c
> @@ -50,7 +50,7 @@ module_param_named(def_disp, def_disp_na
>  MODULE_PARM_DESC(def_disp, "default display name");
>  
>  #ifdef DEBUG
> -unsigned int dss_debug;
> +bool dss_debug;
>  module_param_named(debug, dss_debug, bool, 0644);
>  #endif


> diff --git a/drivers/video/omap2/omapfb/omapfb-main.c
> b/drivers/video/omap2/omapfb/omapfb-main.c
> --- a/drivers/video/omap2/omapfb/omapfb-main.c
> +++ b/drivers/video/omap2/omapfb/omapfb-main.c
> @@ -43,18 +43,18 @@
>  
>  static char *def_mode;
>  static char *def_vram;
> -static int def_vrfb;
> +static bool def_vrfb;
>  static int def_rotate;
> -static int def_mirror;
> +static bool def_mirror;
>  static bool auto_update;
>  static unsigned int auto_update_freq;
>  module_param(auto_update, bool, 0);
>  module_param(auto_update_freq, uint, 0644);
>  
>  #ifdef DEBUG
> -unsigned int omapfb_debug;
> +bool omapfb_debug;
>  module_param_named(debug, omapfb_debug, bool, 0644);
> -static unsigned int omapfb_test_pattern;
> +static bool omapfb_test_pattern;
>  module_param_named(test, omapfb_test_pattern, bool, 0644);
>  #endif

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]