Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp901287ybm; Wed, 27 May 2020 10:40:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylzsOW5Gup8D37YBOXlNLaSKh5iE7jDPubLxsvCf2st/azVBvDRvT5jzySKDG5khmz/lr1 X-Received: by 2002:a17:906:b2c1:: with SMTP id cf1mr7560195ejb.135.1590601248071; Wed, 27 May 2020 10:40:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590601248; cv=none; d=google.com; s=arc-20160816; b=i8tFZSflf6AS544hGJ5LJLsgSw9yLcSwhx/urR7rJFS3bscfDdw1wvtnfJgow9U/nB TVxnGxoNw3wekMfaYEOoYEv/KpLlY7uFLWB3p5Rf9UpVhRXQ1afZssuwdQ2433TeV1TG gt2yUmPRWSuFR0f6DqMUBTbbY15tUuYTUMEJSmmWJZB/0YaCF1TVwi7jsuvhmuVFRw49 dqjqCpEeNijwqAxBA/lso8EpUnwaAkFuHz9YzI/Uh2HMGoeJJ2YRiDT1DacjKLC10hHE 46796brSklGcQ3AOlR7yh8ir50P/FmkyDzDaRnSuIMxsYpAVmKu8HYAywrbv+UysI2XR +J7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=XWWS9ro/YRff8bbPIjou+otKxM3Mm8HjEb2/5TckCFQ=; b=By/gcxyTC7kFt060c09yWkm1C5M2zVnFwGdZ1prNata/AgLoFtnfWoqo9+B6GlZ2Kb yVVQo5yNdszeb9oyvDvRzuPriP5Ak+Ny/OjM3VgMAaPOSTHG35vM9O1VEyqO0Vl7JPD1 hX8eTm71pAXdbkAF1OWs2TbSC4lNsejr60w5dAZ7ZnPiU1SZiYLtccd7CdZsqynmXeoL ndMMZcMc6Y2LQyLprRe5sqcI514VGrsW8APwUXvAalI0fvAOYwyrJt7PHeO3veVzvijY EHQmFjLGu2Bd0w1IiCa6CYvNVXIjxz/DODMihKEATE2OyAaqISc/PuOo5sMdH5g+xFAX WnDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ov7si2331206ejb.409.2020.05.27.10.40.23; Wed, 27 May 2020 10:40:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388550AbgE0NlX (ORCPT + 99 others); Wed, 27 May 2020 09:41:23 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:43773 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726810AbgE0NlX (ORCPT ); Wed, 27 May 2020 09:41:23 -0400 Received: from threadripper.lan ([149.172.98.151]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1N7Qp3-1ixLzb0LZl-017j0Y; Wed, 27 May 2020 15:41:14 +0200 From: Arnd Bergmann To: Solarflare linux maintainers , Edward Cree , Martin Habets , "David S. Miller" , Jakub Kicinski Cc: Arnd Bergmann , "Alex Maftei (amaftei)" , Tom Zhao , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] sfc: avoid an unused-variable warning Date: Wed, 27 May 2020 15:41:06 +0200 Message-Id: <20200527134113.827128-1-arnd@arndb.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:2qV0ouQ231GRn5/kmWBmCmf9v/l6VkWkkO3TQdHRDfHjfMM+7ni uNhtbVK3yyHkAKZcYRcmUOtm9iCNP0EJwVz8jtshL8KiO72f7c7oRw8njgaQMbX7LD3RmCt 6eQMcNDRSdNV5euilakJ078ge8+A2zQrCjKcQ58RAv96TdUAmOUNyAptZy+nG254GOrDmIb mWZ21CET7e5EYyb9j2RRA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:xyZRuz9UDIc=:ROAlNwSe1jkIIEWyvDI7sy b4OxXNEOVdY3DzEPD+lC8Y4PLENkqKSEfAsl1yXE6SlNx0c2DQAa4coaw2TnbqwdQEXIOsa9h oKwAAmbni18D996g/cKxF3OfljaLKdFUNWug0DLb+pIz9ryqJDd/qI1NmDwjFErNTBt/3xec1 dI+SwVJQsFGnuRR/pK1AtiisYgeD30kJQzUoKUF6fWFBWMi25gQw75g4MldGR9T/TbfWRT5Pl diwIA+VkipOpLdYg09S0/yDFTaFIx4LaArr5vTY+cuRQTD9ddpGiNPsBYJz7utG7Icgf23KHz 9Jfjir+liGxJt4vmZkS/a5CSMQTymez0JegbR5SqPD8Bg6ELX9SyXiKlSk+dszBuu05Cc4mBY IbLWKF8W+WN8nuoUaUdLc2Bg6WC8gfCAuB6k7ln8Wk9l7uBP+m8RPpKlxuMfZ+lBm6Nl7kOuM r+RACoXjZSCoAzuNp6vKd76UYy6PW+trZBWiV0Crv/dpGrkDIEFrXFA7tXgDzx+dzhGQWHmSO hlDTUAEnmT5qZzugIC0XnyNbJJtHrn7B0lewu95cZ+7Rj8JCC6ZKd70KwCca2ScszqeGhBYNm n+F0E8Q33P7pUCzs2Aka6Jnu5ZFRMs+NgrcClvG1HZ/MPkNca2h7tav7hJoG+2Rq6dzHeS8w6 Sk2stqiNbXXPWWXUS3eX4l2lezOC2izmSnmsLU8tHJTqwSwoIonw+Q+MnmNNutZ3ptbNhkVb1 jIMEjurL55VygZqdIKBeX+nz96Y7NIz6S062I0J8qrdVkyztSQ9iYd+ij9f1YGXqo3gvXNYZe 1MGFsIy0OsZRBeS8bI0yCZ9IT5dSy92+ZnG8vX1hIBztW2OrhM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 'nic_data' is no longer used outside of the #ifdef block in efx_ef10_set_mac_address: drivers/net/ethernet/sfc/ef10.c:3231:28: error: unused variable 'nic_data' [-Werror,-Wunused-variable] struct efx_ef10_nic_data *nic_data = efx->nic_data; Move the variable into a local scope. Fixes: dfcabb078847 ("sfc: move vport_id to struct efx_nic") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/sfc/ef10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c index e634e8110585..964c5e842cec 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c @@ -3228,7 +3228,6 @@ static int efx_ef10_vport_set_mac_address(struct efx_nic *efx) static int efx_ef10_set_mac_address(struct efx_nic *efx) { MCDI_DECLARE_BUF(inbuf, MC_CMD_VADAPTOR_SET_MAC_IN_LEN); - struct efx_ef10_nic_data *nic_data = efx->nic_data; bool was_enabled = efx->port_enabled; int rc; @@ -3256,6 +3255,7 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx) #ifdef CONFIG_SFC_SRIOV if (efx->pci_dev->is_virtfn && efx->pci_dev->physfn) { + struct efx_ef10_nic_data *nic_data = efx->nic_data; struct pci_dev *pci_dev_pf = efx->pci_dev->physfn; if (rc == -EPERM) { -- 2.26.2