Commit c127d408 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: remove stmmac_dwmac4_get_mac_addr() 



stmmac_dwmac4_get_mac_addr() is identical to stmmac_get_mac_addr().
Remove stmmac_dwmac4_get_mac_addr() to avoid this code duplication.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vypJM-0000000CSiJ-48yO@rmk-PC.armlinux.org.uk


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

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

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void dwmac4_get_umac_addr(struct mac_device_info *hw, 
{

	void __iomem *ioaddr = hw->pcsr;



	stmmac_dwmac4_get_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n),

	stmmac_get_mac_addr(ioaddr, addr, GMAC_ADDR_HIGH(reg_n),

			    GMAC_ADDR_LOW(reg_n));

}

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

+0 −18
Original line number Diff line number Diff line
@@ -226,21 +226,3 @@ void stmmac_dwmac4_set_mac(void __iomem *ioaddr, bool enable) 
	if (value != old_val)

		writel(value, ioaddr + GMAC_CONFIG);

}
 


void stmmac_dwmac4_get_mac_addr(void __iomem *ioaddr, unsigned char *addr,

				unsigned int high, unsigned int low)

{

	unsigned int hi_addr, lo_addr;



	/* Read the MAC address from the hardware */

	hi_addr = readl(ioaddr + high);

	lo_addr = readl(ioaddr + low);



	/* Extract the MAC address from the high and low words */

	addr[0] = lo_addr & 0xff;

	addr[1] = (lo_addr >> 8) & 0xff;

	addr[2] = (lo_addr >> 16) & 0xff;

	addr[3] = (lo_addr >> 24) & 0xff;

	addr[4] = hi_addr & 0xff;

	addr[5] = (hi_addr >> 8) & 0xff;

}