Commit 32d1bbb1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jakub Kicinski
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210202130650.865023-1-geert@linux-m68k.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fca23f37

drivers/net/ethernet/freescale/fec_main.c

+4 −3
Original line number Diff line number Diff line
@@ -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