mv643xx_eth: move mac_addr inside mv643xx_eth_platform_data

The information contained within platform_data should be self-contained.
Replace the pointer to a MAC address with the actual MAC address in
struct mv643xx_eth_platform_data.

Signed-off-by: Dale Farnsworth <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
This commit is contained in:
Dale Farnsworth 2007-03-01 16:31:48 -07:00 • committed by Jeff Garzik
commit 5ada386bad
5 changed files with 12 additions and 44 deletions

View file

@ -1380,7 +1380,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
pd = pdev->dev.platform_data;
if (pd) {
if (pd->mac_addr)
if (is_valid_ether_addr(pd->mac_addr))
memcpy(dev->dev_addr, pd->mac_addr, 6);
if (pd->phy_addr || pd->force_phy_addr)