From patchwork Wed Mar 23 16:37:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102537 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp133788lbc; Wed, 23 Mar 2016 09:38:23 -0700 (PDT) X-Received: by 10.98.72.16 with SMTP id v16mr5633900pfa.5.1458751103175; Wed, 23 Mar 2016 09:38:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g1si5400059pfd.0.2016.03.23.09.38.22; Wed, 23 Mar 2016 09:38:23 -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 S1755814AbcCWQiV (ORCPT + 29 others); Wed, 23 Mar 2016 12:38:21 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:63926 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751430AbcCWQiU (ORCPT ); Wed, 23 Mar 2016 12:38:20 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lp6Wq-1a69G403Ii-00eqDU; Wed, 23 Mar 2016 17:38:04 +0100 From: Arnd Bergmann To: Jiri Pirko , Ido Schimmel Cc: Arnd Bergmann , "David S. Miller" , Elad Raz , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: mlxsw: avoid unused variable warnings Date: Wed, 23 Mar 2016 17:37:38 +0100 Message-Id: <1458751080-2044921-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:x0RM2SFheZ+6WrYM2lk57X7MA4dQN3oD0FDulX4qxJQPvl2TTyT QhMR+IRRCHSYi7h9kbTqw9WmCtmJr9/lKxNN7mQNnIiMxCjoLooFoJDIxAn+jLwae+6uHyU AJqBaLmPxSWXrxg/CqnClnzhcEZeoF5vvuTW5bWeUdvJi2Tt+Zz9ntcxKcrqnL/gLHj/8HS 5D9Gwu+nzKap27l5AKt3A== X-UI-Out-Filterresults: notjunk:1; V01:K0:9ZM54Bl4AJk=:izmyay9jUnbigWUXVx/XZ9 q1j5SnYNoYXQNP69ZvHYggN/f1JMDn4UyyOnIDXn8JMbJzNzauO1yccCHDjv7wpiavmBneecF QgzMB6jCrUkoHrZqHOT9ePiOuHW7/6Qs9KxJ12QZ6iuYwzgqPdFpj6cokFgxNKwfUQPL9rVfl 4N4s58txrntvwoBXOMRU7teh+rr5f42y+N/pD0lF94ElYgN2cjjy32Ko9S3bbHUlMNszbhg5P OAChrYC0Xkw6H2UIgJ5OQymHkt406f1T/bb/TGClnjT+gAHt/SuTLut+ftUDBbq063YN5GOtc Zv1b3xBV+diNo8mnp5vkCnfYlAjyqL8m/M0dcqRk7W1RYHjvGhRySxVWWYLIUzj2k+HjCPvDt p5EZIx9cFC+zR3xFYAu/3xZYp25XSWMXsyXBNZwntl0/QV6VTTAKK9IlJ5FFVb7s71t7NJFgB IoSAoZTz+BdBAD/eGt2kEck7GAEqYYRPy8Nx/+tfZVbEvwJRCeLZojdo1CgsTz7RUEmHRjaGL OpJSbfFgnheNItcTEsOdGeeqLGVPAVmSPuGIwx1h3EaP4tCuRyLn1/jDJGPISmdJ5Xiz+qta1 a0hofGvx4vza1LPAeDuW5721v3FqUTCsQLcOLh4buVOWkMYx3CHRlAmjdFF6v9Ii/yhilVTP6 o0evmqWVfp952crD6qyTu2AqlMkra35JA+WDolob1dJr1ow0JQ3YCCx07eft5NP+xDkk= 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 arguments 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] This changes the mlxsw driver to remove the local variables we get warnings for and instead pass the device directly into the API. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlxsw/pci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.7.0 diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 7f4173c8eda3..fdcce03b028d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -643,7 +643,6 @@ static void mlxsw_pci_cqe_sdq_handle(struct mlxsw_pci *mlxsw_pci, u16 consumer_counter_limit, char *cqe) { - struct pci_dev *pdev = mlxsw_pci->pdev; struct mlxsw_pci_queue_elem_info *elem_info; char *wqe; struct sk_buff *skb; @@ -659,7 +658,7 @@ static void mlxsw_pci_cqe_sdq_handle(struct mlxsw_pci *mlxsw_pci, elem_info->u.sdq.skb = NULL; if (q->consumer_counter++ != consumer_counter_limit) - dev_dbg_ratelimited(&pdev->dev, "Consumer counter does not match limit in SDQ\n"); + dev_dbg_ratelimited(&mlxsw_pci->pdev->dev, "Consumer counter does not match limit in SDQ\n"); spin_unlock(&q->lock); } @@ -668,7 +667,6 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, u16 consumer_counter_limit, char *cqe) { - struct pci_dev *pdev = mlxsw_pci->pdev; struct mlxsw_pci_queue_elem_info *elem_info; char *wqe; struct sk_buff *skb; @@ -684,7 +682,7 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, mlxsw_pci_wqe_frag_unmap(mlxsw_pci, wqe, 0, DMA_FROM_DEVICE); if (q->consumer_counter++ != consumer_counter_limit) - dev_dbg_ratelimited(&pdev->dev, "Consumer counter does not match limit in RDQ\n"); + dev_dbg_ratelimited(&mlxsw_pci->pdev->dev, "Consumer counter does not match limit in RDQ\n"); if (mlxsw_pci_cqe_lag_get(cqe)) { rx_info.is_lag = true; @@ -706,7 +704,7 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, memset(wqe, 0, q->elem_size); err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info); if (err) - dev_dbg_ratelimited(&pdev->dev, "Failed to alloc skb for RDQ\n"); + dev_dbg_ratelimited(&mlxsw_pci->pdev->dev, "Failed to alloc skb for RDQ\n"); /* Everything is set up, ring doorbell to pass elem to HW */ q->producer_counter++; mlxsw_pci_queue_doorbell_producer_ring(mlxsw_pci, q);