lkml.org 
[lkml]   [2016]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 15/76] paride: make 'verbose' parameter an 'int' again
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit dec63a4dec2d6d01346fd5d96062e67c0636852b upstream.

    gcc-6.0 found an ancient bug in the paride driver, which had a
    "module_param(verbose, bool, 0);" since before 2.6.12, but actually uses
    it to accept '0', '1' or '2' as arguments:

    drivers/block/paride/pd.c: In function 'pd_init_dev_parms':
    drivers/block/paride/pd.c:298:29: warning: comparison of constant '1' with boolean expression is always false [-Wbool-compare]
    #define DBMSG(msg) ((verbose>1)?(msg):NULL)

    In 2012, Rusty did a cleanup patch that also changed the type of the
    variable to 'bool', which introduced what is now a gcc warning.

    This changes the type back to 'int' and adapts the module_param() line
    instead, so it should work as documented in case anyone ever cares about
    running the ancient driver with debugging.

    Fixes: 90ab5ee94171 ("module_param: make bool parameters really bool (drivers & misc)")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Rusty Russell <rusty@rustcorp.com.au>
    Cc: Tim Waugh <tim@cyberelk.net>
    Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
    Cc: Jens Axboe <axboe@fb.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/block/paride/pd.c | 4 ++--
    drivers/block/paride/pt.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
    index 19ad8f0c83ef..897b6b9e53b1 100644
    --- a/drivers/block/paride/pd.c
    +++ b/drivers/block/paride/pd.c
    @@ -126,7 +126,7 @@
    */
    #include <linux/types.h>

    -static bool verbose = 0;
    +static int verbose = 0;
    static int major = PD_MAJOR;
    static char *name = PD_NAME;
    static int cluster = 64;
    @@ -161,7 +161,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
    static DEFINE_MUTEX(pd_mutex);
    static DEFINE_SPINLOCK(pd_lock);

    -module_param(verbose, bool, 0);
    +module_param(verbose, int, 0);
    module_param(major, int, 0);
    module_param(name, charp, 0);
    module_param(cluster, int, 0);
    diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
    index 2596042eb987..ada45058e04d 100644
    --- a/drivers/block/paride/pt.c
    +++ b/drivers/block/paride/pt.c
    @@ -117,7 +117,7 @@

    */

    -static bool verbose = 0;
    +static int verbose = 0;
    static int major = PT_MAJOR;
    static char *name = PT_NAME;
    static int disable = 0;
    @@ -152,7 +152,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};

    #include <asm/uaccess.h>

    -module_param(verbose, bool, 0);
    +module_param(verbose, int, 0);
    module_param(major, int, 0);
    module_param(name, charp, 0);
    module_param_array(drive0, int, NULL, 0);
    --
    2.8.2
    \
     
     \ /
      Last update: 2016-05-19 11:41    [W:3.371 / U:0.632 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site