Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9660638 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

ravb: read MAC address registers only once 



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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04f96468

drivers/net/ethernet/renesas/ravb_main.c

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

	}

}