From patchwork Thu Mar 24 21:19:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102533 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp901205lbc; Thu, 24 Mar 2016 14:20:42 -0700 (PDT) X-Received: by 10.66.220.66 with SMTP id pu2mr15903727pac.115.1458854441855; Thu, 24 Mar 2016 14:20:41 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si14514296pfn.223.2016.03.24.14.20.41; Thu, 24 Mar 2016 14:20:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751816AbcCXVUi (ORCPT + 29 others); Thu, 24 Mar 2016 17:20:38 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:50683 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751362AbcCXVUf (ORCPT ); Thu, 24 Mar 2016 17:20:35 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0LehKM-1Zybaw2hfq-00qQk0; Thu, 24 Mar 2016 22:20:08 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Andrew Lunn , "David S. Miller" , Hiroshi Doyu , Aaron Conole , Arnd Bergmann , "Rafael J. Wysocki" , Dmitry Torokhov , linux-kernel@vger.kernel.org Subject: [PATCH] driver-core: use 'dev' argument in dev_dbg_ratelimited stub Date: Thu, 24 Mar 2016 22:19:40 +0100 Message-Id: <1458854400-3659802-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:tDV6vqc9YMkhwTMsZTxpP9MCdMeGf/O7RHALCUCrcrp74XxvhVJ HSD2K/cMYjXbale0uU5SrcEYPSeTTVkHcpuHMJwUF1AcObL7fp/Gt5fy3tY+7BaTBYpp3jH WVf1tEM1bRBsLXUMrYp0cnqR3+4UdK1rk4IBNHEwsx/7F63RYNmhEIC59DWsiOUqzGeTzdF RrbfAjZMqaKV7+li95nJQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ev6J9dIrr04=:6sVoOwQaIIBz7DyrUKUGP/ NJxdYxrv//42q5i+xxhePDVgVnqNFpFIoKrkYJ2GhgFnpYj+IdtYRgjjwWos1hL4k8BddSQx1 gC6pkUjI38KxsDcTiMJZHkPhHTtv90FaE3co04iQBA5T7BrCPEkKKLBd7mUKonyb8Zkr2D+1n QsRWDZKGb+2N9/zd0PHVWbZUcIgFxMFd5Pd3/n0BFP3IjVOyo5Z4YVXzx1s5qH5swd+GfAPwA vQ0Rt8GyUk+uWD/du5F5l/FPyTEoJSEvv9kJ6+BpLgRO5AeiX7d8mWE8+NDAVT+EgCRZKeHtq 5CqlNGzsPKRjpMwEXEglmGxGUZnCP/Kk0OqeEuvej6t0mtz1S1+HXtbRs6wtsojBNxO+uUZBw IA2oFT4LRsayR1v3B093zLh3pMZa8leqed3+S/VqcRpHnNLGOC7JrXMTQ5nIuxcPwDq3Wj417 ylcVOblnhNWxmMZYMC5fdS8XYsIuXObB/pNQF0g5rHajh00/WGBn8X82pVPttb3dTHR1O2iTF yrFoLueLjDQ0nROgyGA5I6AnO5x/v7QxE6JSno7UaO0gLW+jhYO3HJGYJHfvJst4HVnvmX7UB d4eq3xZaRQy27sWrGY+I26A/+hqxUfqJhcS33zqvBimRP6AKYobFzdlAohdtDfVJq2Z80KZUf aq4bnP25WSZ2p5xJmBuXBXdplq3PynFB1I9fDJvQIkP3L7fuyFrlng5BySFf22rVUKsM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dev_dbg_ratelimited() is a macro that ignores its first argument when DEBUG is not set, which can lead to unused variable warnings: ethernet/mellanox/mlxsw/pci.c: In function 'mlxsw_pci_cqe_sdq_handle': ethernet/mellanox/mlxsw/pci.c:646:18: warning: unused variable 'pdev' [-Wunused-variable] ethernet/mellanox/mlxsw/pci.c: In function 'mlxsw_pci_cqe_rdq_handle': ethernet/mellanox/mlxsw/pci.c:671:18: warning: unused variable 'pdev' [-Wunused-variable] The macro already ensures that all its other arguments are silently ignored by the compiler without triggering a warning, through the use of the no_printk() macro, but the dev argument is not passed into that. This changes the definition to use the same trick as no_printk() with an if(0) that leads the compiler to not evaluate the side-effects but still see that 'dev' might not be unused. Signed-off-by: Arnd Bergmann Suggested-by: Andrew Lunn Fixes: 6f586e663e3b ("driver-core: Shut up dev_dbg_reatelimited() without DEBUG") --- include/linux/device.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/include/linux/device.h b/include/linux/device.h index 002c59728dbe..07f74c246cac 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1293,8 +1293,11 @@ do { \ dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); \ } while (0) #else -#define dev_dbg_ratelimited(dev, fmt, ...) \ - no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) +#define dev_dbg_ratelimited(dev, fmt, ...) \ +do { \ + if (0) \ + dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); \ +} while (0) #endif #ifdef VERBOSE_DEBUG