system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

sh_eth: read MAC address registers only once

Browse source 
The code reading the MAHR/MALR registers in read_mac_address() is terribly
ineffective -- it reads MAHR 4 times and MALR 2 times, while it's enough to
read each register only once.  Use the local variables to achieve that,
somewhat beautifying the code while at it...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sergei Shtylyov 2015-12-05 00:58:57 +03:00 committed by David S. Miller
parent d966063897
commit 37742f028b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/ethernet/renesas/sh_eth.c
View file

@ -989,12 +989,15 @@ static void read_mac_address(struct net_device *ndev, unsigned char *mac)
if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) { if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) {
memcpy(ndev->dev_addr, mac, ETH_ALEN); memcpy(ndev->dev_addr, mac, ETH_ALEN);
} else { } else {
ndev->dev_addr[0] = (sh_eth_read(ndev, MAHR) >> 24); u32 mahr = sh_eth_read(ndev, MAHR);
ndev->dev_addr[1] = (sh_eth_read(ndev, MAHR) >> 16) & 0xFF; u32 malr = sh_eth_read(ndev, MALR);
ndev->dev_addr[2] = (sh_eth_read(ndev, MAHR) >> 8) & 0xFF;
ndev->dev_addr[3] = (sh_eth_read(ndev, MAHR) & 0xFF); ndev->dev_addr[0] = (mahr >> 24) & 0xFF;
ndev->dev_addr[4] = (sh_eth_read(ndev, MALR) >> 8) & 0xFF; ndev->dev_addr[1] = (mahr >> 16) & 0xFF;
ndev->dev_addr[5] = (sh_eth_read(ndev, MALR) & 0xFF); ndev->dev_addr[2] = (mahr >> 8) & 0xFF;
ndev->dev_addr[3] = (mahr >> 0) & 0xFF;
ndev->dev_addr[4] = (malr >> 8) & 0xFF;
ndev->dev_addr[5] = (malr >> 0) & 0xFF;
} }
} }