Commit 2d7efc56 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Sasha Levin

paride: make 'verbose' parameter an 'int' again

[ Upstream commit dec63a4d ]

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: 90ab5ee9 ("module_param: make bool parameters really bool (drivers & misc)")
Signed-off-by: default avatarArnd 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 1cc58547
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
*/ */
#include <linux/types.h> #include <linux/types.h>
static bool verbose = 0; static int verbose = 0;
static int major = PD_MAJOR; static int major = PD_MAJOR;
static char *name = PD_NAME; static char *name = PD_NAME;
static int cluster = 64; 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}; ...@@ -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_MUTEX(pd_mutex);
static DEFINE_SPINLOCK(pd_lock); static DEFINE_SPINLOCK(pd_lock);
module_param(verbose, bool, 0); module_param(verbose, int, 0);
module_param(major, int, 0); module_param(major, int, 0);
module_param(name, charp, 0); module_param(name, charp, 0);
module_param(cluster, int, 0); module_param(cluster, int, 0);
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
*/ */
static bool verbose = 0; static int verbose = 0;
static int major = PT_MAJOR; static int major = PT_MAJOR;
static char *name = PT_NAME; static char *name = PT_NAME;
static int disable = 0; static int disable = 0;
...@@ -152,7 +152,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3}; ...@@ -152,7 +152,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
#include <asm/uaccess.h> #include <asm/uaccess.h>
module_param(verbose, bool, 0); module_param(verbose, int, 0);
module_param(major, int, 0); module_param(major, int, 0);
module_param(name, charp, 0); module_param(name, charp, 0);
module_param_array(drive0, int, NULL, 0); module_param_array(drive0, int, NULL, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment