Commit 3eea593b authored by Wei Fang's avatar Wei Fang Committed by Jakub Kicinski
Browse files

net: fec: remove useless conditional preprocessor directives 



The conditional preprocessor directive was added to fix build errors on
the MCF5272 platform, see commit d1391930 ("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,
and for MCF5272, its quirks is 0, so it does not support RACC and GBIT
Ethernet. So these preprocessor directives are no longer required and
can be safely removed without causing build or functional issue.

Signed-off-by: default avatarWei Fang <wei.fang@nxp.com>
Link: https://patch.msgid.link/20251119025148.2817602-2-wei.fang@nxp.com


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

drivers/net/ethernet/freescale/fec_main.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

	/*
@@ -2517,9 +2515,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);
@@ -4402,11 +4398,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);