Skip to content

Commit

Permalink
ravb: read MAC address registers only once
Browse files Browse the repository at this point in the history
The code reading the MAHR/MALR registers in ravb_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>
  • Loading branch information
Sergei Shtylyov authored and David S. Miller committed Dec 6, 2015
1 parent 04f9646 commit d966063
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions drivers/net/ethernet/renesas/ravb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,15 @@ static void ravb_read_mac_address(struct net_device *ndev, const u8 *mac)
if (mac) {
ether_addr_copy(ndev->dev_addr, mac);
} else {
ndev->dev_addr[0] = (ravb_read(ndev, MAHR) >> 24);
ndev->dev_addr[1] = (ravb_read(ndev, MAHR) >> 16) & 0xFF;
ndev->dev_addr[2] = (ravb_read(ndev, MAHR) >> 8) & 0xFF;
ndev->dev_addr[3] = (ravb_read(ndev, MAHR) >> 0) & 0xFF;
ndev->dev_addr[4] = (ravb_read(ndev, MALR) >> 8) & 0xFF;
ndev->dev_addr[5] = (ravb_read(ndev, MALR) >> 0) & 0xFF;
u32 mahr = ravb_read(ndev, MAHR);
u32 malr = ravb_read(ndev, MALR);

ndev->dev_addr[0] = (mahr >> 24) & 0xFF;
ndev->dev_addr[1] = (mahr >> 16) & 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;
}
}

Expand Down

0 comments on commit d966063

Please sign in to comment.