The conditional preprocessor directive "#if !defined(CONFIG_M5272)" was
added due to build errors on MCF5272 platform, see commit d13919301d9a
("net: fec: Fix build for MCF5272"). The compilation error was caused by
some register macros not being defined on the MCF5272 platform. However,
this preprocessor directive is not needed in some parts of the driver.
First, removing it will not cause compilation errors. Second, these parts
will check quirks, which do not exist on the MCF7527 platform. Therefore,
we can safely delete these useless preprocessor directives.
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
drivers/net/ethernet/freescale/fec_main.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 742f3e81cc7c..e0e84f2979c8 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1773,7 +1773,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
__fec32 cbd_bufaddr;
u32 sub_len = 4;
-#if !defined(CONFIG_M5272)
/*If it has the FEC_QUIRK_HAS_RACC quirk property, the bit of
* FEC_RACC_SHIFT16 is set by default in the probe function.
*/
@@ -1781,7 +1780,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
data_start += 2;
sub_len += 2;
}
-#endif
#if defined(CONFIG_COLDFIRE) && !defined(CONFIG_COLDFIRE_COHERENT_DMA)
/*
@@ -2515,9 +2513,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
phy_set_max_speed(phy_dev, 1000);
phy_remove_link_mode(phy_dev,
ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
-#if !defined(CONFIG_M5272)
phy_support_sym_pause(phy_dev);
-#endif
}
else
phy_set_max_speed(phy_dev, 100);
@@ -4400,11 +4396,9 @@ fec_probe(struct platform_device *pdev)
fep->num_rx_queues = num_rx_qs;
fep->num_tx_queues = num_tx_qs;
-#if !defined(CONFIG_M5272)
/* default enable pause frame auto negotiation */
if (fep->quirks & FEC_QUIRK_HAS_GBIT)
fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
-#endif
/* Select default pin state */
pinctrl_pm_select_default_state(&pdev->dev);
--
2.34.1
On Tue, Nov 11, 2025 at 06:00:53PM +0800, Wei Fang wrote:
> The conditional preprocessor directive "#if !defined(CONFIG_M5272)" was
> added due to build errors on MCF5272 platform, see commit d13919301d9a
> ("net: fec: Fix build for MCF5272"). The compilation error was caused by
> some register macros not being defined on the MCF5272 platform. However,
> this preprocessor directive is not needed in some parts of the driver.
> First, removing it will not cause compilation errors. Second, these parts
> will check quirks, which do not exist on the MCF7527 platform. Therefore,
> we can safely delete these useless preprocessor directives.
> @@ -2515,9 +2513,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
> phy_set_max_speed(phy_dev, 1000);
> phy_remove_link_mode(phy_dev,
> ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
> -#if !defined(CONFIG_M5272)
> phy_support_sym_pause(phy_dev);
> -#endif
> }
I think the explanation could be better.
I assume the M5272 only supported Fast Ethernet, so fep->quirks &
FEC_QUIRK_HAS_GBIT was never true?
> else
> phy_set_max_speed(phy_dev, 100);
> @@ -4400,11 +4396,9 @@ fec_probe(struct platform_device *pdev)
> fep->num_rx_queues = num_rx_qs;
> fep->num_tx_queues = num_tx_qs;
>
> -#if !defined(CONFIG_M5272)
> /* default enable pause frame auto negotiation */
> if (fep->quirks & FEC_QUIRK_HAS_GBIT)
> fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
> -#endif
Same here?
Maybe the commit message should actually say that M5272 only supported
Fast Ethernet, so these conditions cannot be true, and so the #ifdef
guard can be removed.
Andrew
---
pw-bot: cr
On Tue, Nov 11, 2025 at 06:00:53PM +0800, Wei Fang wrote:
> The conditional preprocessor directive "#if !defined(CONFIG_M5272)" was
> added due to build errors on MCF5272 platform, see commit d13919301d9a
> ("net: fec: Fix build for MCF5272"). The compilation error was caused by
> some register macros not being defined on the MCF5272 platform.
> However,
> this preprocessor directive is not needed in some parts of the driver.
> First, removing it will not cause compilation errors. Second, these parts
> will check quirks, which do not exist on the MCF7527 platform. Therefore,
> we can safely delete these useless preprocessor directives.
How about
Drop conditional preprocessor directives added to fix build errors on the
MCF5272 platform (see commit d13919301d9a "net: fec: Fix build for
MCF5272"). The compilation errors were originally caused by some register
macros not being defined on that platform.
The driver now uses quirks to dynamically handle platform differences,
so these directives are no longer required and can be safely removed
without causing compilation or functional issue.
Frank
>
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
> drivers/net/ethernet/freescale/fec_main.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 742f3e81cc7c..e0e84f2979c8 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1773,7 +1773,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
> __fec32 cbd_bufaddr;
> u32 sub_len = 4;
>
> -#if !defined(CONFIG_M5272)
> /*If it has the FEC_QUIRK_HAS_RACC quirk property, the bit of
> * FEC_RACC_SHIFT16 is set by default in the probe function.
> */
> @@ -1781,7 +1780,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
> data_start += 2;
> sub_len += 2;
> }
> -#endif
>
> #if defined(CONFIG_COLDFIRE) && !defined(CONFIG_COLDFIRE_COHERENT_DMA)
> /*
> @@ -2515,9 +2513,7 @@ static int fec_enet_mii_probe(struct net_device *ndev)
> phy_set_max_speed(phy_dev, 1000);
> phy_remove_link_mode(phy_dev,
> ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
> -#if !defined(CONFIG_M5272)
> phy_support_sym_pause(phy_dev);
> -#endif
> }
> else
> phy_set_max_speed(phy_dev, 100);
> @@ -4400,11 +4396,9 @@ fec_probe(struct platform_device *pdev)
> fep->num_rx_queues = num_rx_qs;
> fep->num_tx_queues = num_tx_qs;
>
> -#if !defined(CONFIG_M5272)
> /* default enable pause frame auto negotiation */
> if (fep->quirks & FEC_QUIRK_HAS_GBIT)
> fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
> -#endif
>
> /* Select default pin state */
> pinctrl_pm_select_default_state(&pdev->dev);
> --
> 2.34.1
>
© 2016 - 2026 Red Hat, Inc.