Commit 10291171 authored Feb 09, 2018 by Niklas Cassel Committed by David S. Miller Feb 09, 2018

net: stmmac: remove redundant enable of PMT irq



For dwmac4, GMAC_INT_DEFAULT_ENABLE already includes
GMAC_INT_PMT_EN, so it is redundant to check if hw->pmt
is set, and if so, setting the bit again.

For dwmac1000, GMAC_INT_DEFAULT_MASK does not include
GMAC_INT_DISABLE_PMT, so it is redundant to check if
hw->pmt is set, and if so, clearing an already cleared bit.

Improve code readability by removing this redundant code.

Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e879b7ab

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -74,8 +74,6 @@ static void dwmac1000_core_init(struct mac_device_info *hw,
		/* Mask GMAC interrupts */
		value = GMAC_INT_DEFAULT_MASK;

		if (hw->pmt)
		value &= ~GMAC_INT_DISABLE_PMT;
		if (hw->pcs)
		value &= ~GMAC_INT_DISABLE_PCS;

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -63,8 +63,7 @@ static void dwmac4_core_init(struct mac_device_info *hw,

		/* Enable GMAC interrupts */
		value = GMAC_INT_DEFAULT_ENABLE;
		if (hw->pmt)
		value \|= GMAC_INT_PMT_EN;

		if (hw->pcs)
		value \|= GMAC_PCS_IRQ_DEFAULT;