From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: linux-next: build warning after merge of the net-next tree Date: Tue, 26 Jul 2016 23:19:59 -0700 (PDT) Message-ID: <20160726.231959.811328304777471297.davem@davemloft.net> References: <20160727161533.5c5d1702@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from shards.monkeyblade.net ([184.105.139.130]:48878 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750813AbcG0GUD (ORCPT ); Wed, 27 Jul 2016 02:20:03 -0400 In-Reply-To: <20160727161533.5c5d1702@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, isubramanian@apm.com Archived-At: List-Archive: List-Post: From: Stephen Rothwell Date: Wed, 27 Jul 2016 16:15:33 +1000 > Hi all, > > After merging the net-next tree, today's linux-next build (powerpc > allyesconfig) produced this warning: > > drivers/net/ethernet/apm/xgene/xgene_enet_hw.c: In function 'xgene_enet_phy_connect': > drivers/net/ethernet/apm/xgene/xgene_enet_hw.c:759:22: warning: unused variable 'adev' [-Wunused-variable] > struct acpi_device *adev; > ^ > > Introduced by commit > > 8089a96f601b ("drivers: net: xgene: Add backward compatibility") > (CONFIG_ACPI si not set for tis build) Fixed thusly: ==================== >>From 36232012344b8db67052432742deaf17f82e70e6 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 26 Jul 2016 23:19:29 -0700 Subject: [PATCH] xgene: Fix build warning with ACPI disabled. drivers/net/ethernet/apm/xgene/xgene_enet_hw.c: In function 'xgene_enet_phy_connect': drivers/net/ethernet/apm/xgene/xgene_enet_hw.c:759:22: warning: unused variable 'adev' [-Wunused-variable] Fixes: 8089a96f601b ("drivers: net: xgene: Add backward compatibility") Reported-by: Stephen Rothwell Signed-off-by: David S. Miller --- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c index 8a2a221..7714b7d 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c @@ -756,7 +756,6 @@ int xgene_enet_phy_connect(struct net_device *ndev) struct device_node *np; struct phy_device *phy_dev; struct device *dev = &pdata->pdev->dev; - struct acpi_device *adev; int i; if (dev->of_node) { @@ -781,7 +780,7 @@ int xgene_enet_phy_connect(struct net_device *ndev) pdata->phy_dev = phy_dev; } else { #ifdef CONFIG_ACPI - adev = acpi_phy_find_device(dev); + struct acpi_device *adev = acpi_phy_find_device(dev); if (adev) pdata->phy_dev = adev->driver_data; -- 2.1.0