From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932527AbcCNWt4 (ORCPT ); Mon, 14 Mar 2016 18:49:56 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:63184 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932361AbcCNWty (ORCPT ); Mon, 14 Mar 2016 18:49:54 -0400 From: Arnd Bergmann To: Tim Waugh Cc: Arnd Bergmann , Sudip Mukherjee , Jens Axboe , Andrew Morton , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH] paride: make 'verbose' parameter an 'int' again Date: Mon, 14 Mar 2016 23:49:14 +0100 Message-Id: <1457995776-1547657-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:Pn+qT9qGrSe8RF207ATsjc3mmEXRVLPTzB3hE6Wb6W0QNtAzonW rf3dZlGZlkZEtN0QKn8CfqUQu6lTj3agWu0foX452MEUtO7KfAh5xhWVAffwIrEta/RBTje pEhcN5xlbyJgie0ZJ9nA4Cu9IjdcxAYAHE3VYJLH3jAEe8wWhJYP/7pZOLjw8zEXAmMZuJg PFW6RwWcOe2IimJCIZDVw== X-UI-Out-Filterresults: notjunk:1;V01:K0:gKX5KVouIwA=:4chXNHWayEz0HwlgvxEX8A W+UFOkU1hMwdcFIzOEZ3WUJ4sLTL5ALqJBVjFeb/QHkYwziy7ckZimEwz3zr5PappZrcYQFi/ 6R79xQtO22azF53wWpIwrXv4sm5HsfRgePqJ4TT7KJ8hgHZgzSA5Y0rfM4lcCeXMY3efOKL4B EULLEYbZPTzPT1wfsWB6+zINUtJ4Vz9NoPO4PXHREsI6NECMYWsnxD3++o/h4NpX8264AjQrb xQIB/QJHDKiZuiJMlJVw5Q1mSkAK3jlV9UzyHusKYjpZeHuKCOo71YSykRp/fbc87lyxipCjs YU+MZmINV5grBVkxRZ7hoHLsAmtB/qW1IaBgc6MI3FsBc9mFLj4pij8VSHPhPfGq/XnL1b4on Wtqebohz+WjEGTqhXWWMYnMt14lOqhp2Y6azNc/i3FJEQWSnQG27mjGqS9dSKpg4JLpURw3nC i6lxaOnI3qWgmBxKmG2JBRRkVHPKKwa3VugHowtPYngCGyNK1+cEbH6+8XN6rAr9zmdfDWh3X OSgLOLM5FQUPZ9Izul7nX9oAZ9iH8Cs31b2SiUBcLyzBmuAZCkKc0sX8HW2Gg2Ehh8Z3MALpm Z9sZpFgrVNOI89wkdf7uFiGVSHC9KXEZWBYl50XKCCoycBMOkbk1nFVf60HIMHHWi0rxVXTgD 14zKXuzRd3wzYvvLswuWvwyz8re2UoTt0vZQgLYly+Xq+5BfrLuF9BiULojNfUVaxUWM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Arnd Bergmann Fixes: 90ab5ee94171 ("module_param: make bool parameters really bool (drivers & misc)") --- 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 562b5a4ca7b7..78a39f736c64 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c @@ -126,7 +126,7 @@ */ #include -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 1740d75e8a32..216a94fed5b4 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 -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.7.0