Skip to content

Commit 32d1bbb

Browse files
geertukuba-moo
authored andcommitted
net: fec: Silence M5272 build warnings
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 <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent fca23f3 commit 32d1bbb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/net/ethernet/freescale/fec_main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,6 @@ static void
945945
fec_restart(struct net_device *ndev)
946946
{
947947
struct fec_enet_private *fep = netdev_priv(ndev);
948-
u32 val;
949948
u32 temp_mac[2];
950949
u32 rcntl = OPT_FRAME_SIZE | 0x04;
951950
u32 ecntl = 0x2; /* ETHEREN */
@@ -997,7 +996,8 @@ fec_restart(struct net_device *ndev)
997996

998997
#if !defined(CONFIG_M5272)
999998
if (fep->quirks & FEC_QUIRK_HAS_RACC) {
1000-
val = readl(fep->hwp + FEC_RACC);
999+
u32 val = readl(fep->hwp + FEC_RACC);
1000+
10011001
/* align IP header */
10021002
val |= FEC_RACC_SHIFT16;
10031003
if (fep->csum_flags & FLAG_RX_CSUM_ENABLED)
@@ -1664,7 +1664,6 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget)
16641664
static void fec_get_mac(struct net_device *ndev)
16651665
{
16661666
struct fec_enet_private *fep = netdev_priv(ndev);
1667-
struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
16681667
unsigned char *iap, tmpaddr[ETH_ALEN];
16691668

16701669
/*
@@ -1695,6 +1694,8 @@ static void fec_get_mac(struct net_device *ndev)
16951694
if (FEC_FLASHMAC)
16961695
iap = (unsigned char *)FEC_FLASHMAC;
16971696
#else
1697+
struct fec_platform_data *pdata = dev_get_platdata(&fep->pdev->dev);
1698+
16981699
if (pdata)
16991700
iap = (unsigned char *)&pdata->mac;
17001701
#endif

0 commit comments

Comments
 (0)