From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752772AbcG0GpQ (ORCPT ); Wed, 27 Jul 2016 02:45:16 -0400 Received: from mail-ua0-f177.google.com ([209.85.217.177]:33549 "EHLO mail-ua0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751339AbcG0GpJ (ORCPT ); Wed, 27 Jul 2016 02:45:09 -0400 MIME-Version: 1.0 In-Reply-To: <20160727163514.564bfe29@canb.auug.org.au> References: <20160727161533.5c5d1702@canb.auug.org.au> <20160726.231959.811328304777471297.davem@davemloft.net> <20160727163514.564bfe29@canb.auug.org.au> From: Iyappan Subramanian Date: Tue, 26 Jul 2016 23:45:07 -0700 Message-ID: Subject: Re: linux-next: build warning after merge of the net-next tree To: Stephen Rothwell Cc: David Miller , netdev , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 26, 2016 at 11:35 PM, Stephen Rothwell wrote: > Hi David, > > On Tue, 26 Jul 2016 23:19:59 -0700 (PDT) David Miller wrote: >> >> 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; > > Looks good to me, thanks. Thanks David, for the quick fix. > > -- > Cheers, > Stephen Rothwell