Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1451059 > unrolled thread

linux-next: build warning after merge of the net-next tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2016-07-27 08:20 +0200
Last post2016-07-27 08:50 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  linux-next: build warning after merge of the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-27 08:20 +0200
    Re: linux-next: build warning after merge of the net-next tree David Miller <davem@davemloft.net> - 2016-07-27 08:30 +0200
      Re: linux-next: build warning after merge of the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-27 08:40 +0200
        Re: linux-next: build warning after merge of the net-next tree Iyappan Subramanian <isubramanian@apm.com> - 2016-07-27 08:50 +0200

#1451059 — linux-next: build warning after merge of the net-next tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-07-27 08:20 +0200
Subjectlinux-next: build warning after merge of the net-next tree
Message-ID<rZqmd-49K-1@gated-at.bofh.it>
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)

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]


#1451064

FromDavid Miller <davem@davemloft.net>
Date2016-07-27 08:30 +0200
Message-ID<rZqvT-4cO-7@gated-at.bofh.it>
In reply to#1451059
From: Stephen Rothwell <sfr@canb.auug.org.au>
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" <davem@davemloft.net>
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 <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 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

[toc] | [prev] | [next] | [standalone]


#1451066

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-07-27 08:40 +0200
Message-ID<rZqFz-4fO-5@gated-at.bofh.it>
In reply to#1451064
Hi David,

On Tue, 26 Jul 2016 23:19:59 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Fixed thusly:
> 
> ====================
> From 36232012344b8db67052432742deaf17f82e70e6 Mon Sep 17 00:00:00 2001
> From: "David S. Miller" <davem@davemloft.net>
> 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 <sfr@canb.auug.org.au>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  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.

-- 
Cheers,
Stephen Rothwell

[toc] | [prev] | [next] | [standalone]


#1451070

FromIyappan Subramanian <isubramanian@apm.com>
Date2016-07-27 08:50 +0200
Message-ID<rZqPg-4jh-5@gated-at.bofh.it>
In reply to#1451066
On Tue, Jul 26, 2016 at 11:35 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi David,
>
> On Tue, 26 Jul 2016 23:19:59 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>>
>> Fixed thusly:
>>
>> ====================
>> From 36232012344b8db67052432742deaf17f82e70e6 Mon Sep 17 00:00:00 2001
>> From: "David S. Miller" <davem@davemloft.net>
>> 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 <sfr@canb.auug.org.au>
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> ---
>>  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

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web