* [PATCH] net: fec: Silence M5272 build warnings
@ 2021-02-02 13:06 Geert Uytterhoeven
2021-02-02 16:27 ` Guenter Roeck
2021-02-03 3:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Geert Uytterhoeven @ 2021-02-02 13:06 UTC (permalink / raw)
To: Fugang Duan, David S . Miller, Jakub Kicinski, Greg Ungerer
Cc: Guenter Roeck, netdev, linux-m68k, linux-kernel, Geert Uytterhoeven
If CONFIG_M5272=y:
drivers/net/ethernet/freescale/fec_main.c: In function ‘fec_restart’:
drivers/net/ethernet/freescale/fec_main.c:948:6: warning: unused variable ‘val’ [-Wunused-variable]
948 | u32 val;
| ^~~
drivers/net/ethernet/freescale/fec_main.c: In function ‘fec_get_mac’:
drivers/net/ethernet/freescale/fec_main.c:1667:28: warning: unused variable ‘pdata’ [-Wunused-variable]
1667 | struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
| ^~~~~
Fix this by moving the variable declarations inside the existing #ifdef
blocks.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/net/ethernet/freescale/fec_main.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 9ebdb0e54291b204..3db882322b2bd3e8 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -945,7 +945,6 @@ static void
fec_restart(struct net_device *ndev)
{
struct fec_enet_private *fep = netdev_priv(ndev);
- u32 val;
u32 temp_mac[2];
u32 rcntl = OPT_FRAME_SIZE | 0x04;
u32 ecntl = 0x2; /* ETHEREN */
@@ -997,7 +996,8 @@ fec_restart(struct net_device *ndev)
#if !defined(CONFIG_M5272)
if (fep->quirks & FEC_QUIRK_HAS_RACC) {
- val = readl(fep->hwp + FEC_RACC);
+ u32 val = readl(fep->hwp + FEC_RACC);
+
/* align IP header */
val |= FEC_RACC_SHIFT16;
if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
@@ -1664,7 +1664,6 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget)
static void fec_get_mac(struct net_device *ndev)
{
struct fec_enet_private *fep = netdev_priv(ndev);
- struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
unsigned char *iap, tmpaddr[ETH_ALEN];
/*
@@ -1695,6 +1694,8 @@ static void fec_get_mac(struct net_device *ndev)
if (FEC_FLASHMAC)
iap = (unsigned char *)FEC_FLASHMAC;
#else
+ struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
+
if (pdata)
iap = (unsigned char *)&pdata->mac;
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: fec: Silence M5272 build warnings
2021-02-02 13:06 [PATCH] net: fec: Silence M5272 build warnings Geert Uytterhoeven
@ 2021-02-02 16:27 ` Guenter Roeck
2021-02-03 3:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2021-02-02 16:27 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Fugang Duan, David S . Miller, Jakub Kicinski, Greg Ungerer,
netdev, linux-m68k, linux-kernel
On Tue, Feb 02, 2021 at 02:06:50PM +0100, Geert Uytterhoeven wrote:
> If CONFIG_M5272=y:
>
> drivers/net/ethernet/freescale/fec_main.c: In function ‘fec_restart’:
> drivers/net/ethernet/freescale/fec_main.c:948:6: warning: unused variable ‘val’ [-Wunused-variable]
> 948 | u32 val;
> | ^~~
> drivers/net/ethernet/freescale/fec_main.c: In function ‘fec_get_mac’:
> drivers/net/ethernet/freescale/fec_main.c:1667:28: warning: unused variable ‘pdata’ [-Wunused-variable]
> 1667 | struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
> | ^~~~~
>
> Fix this by moving the variable declarations inside the existing #ifdef
> blocks.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/net/ethernet/freescale/fec_main.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 9ebdb0e54291b204..3db882322b2bd3e8 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -945,7 +945,6 @@ static void
> fec_restart(struct net_device *ndev)
> {
> struct fec_enet_private *fep = netdev_priv(ndev);
> - u32 val;
> u32 temp_mac[2];
> u32 rcntl = OPT_FRAME_SIZE | 0x04;
> u32 ecntl = 0x2; /* ETHEREN */
> @@ -997,7 +996,8 @@ fec_restart(struct net_device *ndev)
>
> #if !defined(CONFIG_M5272)
> if (fep->quirks & FEC_QUIRK_HAS_RACC) {
> - val = readl(fep->hwp + FEC_RACC);
> + u32 val = readl(fep->hwp + FEC_RACC);
> +
> /* align IP header */
> val |= FEC_RACC_SHIFT16;
> if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
> @@ -1664,7 +1664,6 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget)
> static void fec_get_mac(struct net_device *ndev)
> {
> struct fec_enet_private *fep = netdev_priv(ndev);
> - struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
> unsigned char *iap, tmpaddr[ETH_ALEN];
>
> /*
> @@ -1695,6 +1694,8 @@ static void fec_get_mac(struct net_device *ndev)
> if (FEC_FLASHMAC)
> iap = (unsigned char *)FEC_FLASHMAC;
> #else
> + struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
> +
> if (pdata)
> iap = (unsigned char *)&pdata->mac;
> #endif
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: fec: Silence M5272 build warnings
2021-02-02 13:06 [PATCH] net: fec: Silence M5272 build warnings Geert Uytterhoeven
2021-02-02 16:27 ` Guenter Roeck
@ 2021-02-03 3:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-02-03 3:10 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: fugang.duan, davem, kuba, gerg, linux, netdev, linux-m68k, linux-kernel
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Tue, 2 Feb 2021 14:06:50 +0100 you wrote:
> If CONFIG_M5272=y:
>
> drivers/net/ethernet/freescale/fec_main.c: In function ‘fec_restart’:
> drivers/net/ethernet/freescale/fec_main.c:948:6: warning: unused variable ‘val’ [-Wunused-variable]
> 948 | u32 val;
> | ^~~
> drivers/net/ethernet/freescale/fec_main.c: In function ‘fec_get_mac’:
> drivers/net/ethernet/freescale/fec_main.c:1667:28: warning: unused variable ‘pdata’ [-Wunused-variable]
> 1667 | struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
> | ^~~~~
>
> [...]
Here is the summary with links:
- net: fec: Silence M5272 build warnings
https://git.kernel.org/netdev/net-next/c/32d1bbb1d609
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-03 3:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 13:06 [PATCH] net: fec: Silence M5272 build warnings Geert Uytterhoeven
2021-02-02 16:27 ` Guenter Roeck
2021-02-03 3:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).