aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-08-26 08:06:47 -0400
committerLennert Buytenhek <buytenh@marvell.com>2008-09-05 00:33:59 -0400
commitac840605f3b1d9b99e1e6629a54994f8e003ff91 (patch)
treec0d47ef7ca41c4f88baa5e66b07f95ad586c7341 /drivers/net/mv643xx_eth.c
parentfc0eb9f226d8ecc8e3b563bf808bd6d61a6153a1 (diff)
mv643xx_eth: remove force_phy_addr field
Currently, there are two different fields in the mv643xx_eth_platform_data struct that together describe the PHY address -- one field (phy_addr) has the address of the PHY, but if that address is zero, a second field (force_phy_addr) needs to be set to distinguish the actual address zero from a zero due to not having filled in the PHY address explicitly (which should mean 'use the default PHY address'). If we are a bit smarter about the encoding of the phy_addr field, we can avoid the need for a second field -- this patch does that. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 6d3da78b7ad5..b4850cf2a8ce 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2412,10 +2412,10 @@ static void set_params(struct mv643xx_eth_private *mp,
2412 else 2412 else
2413 uc_addr_get(mp, dev->dev_addr); 2413 uc_addr_get(mp, dev->dev_addr);
2414 2414
2415 if (pd->phy_addr == -1) { 2415 if (pd->phy_addr == MV643XX_ETH_PHY_NONE) {
2416 mp->phy_addr = -1; 2416 mp->phy_addr = -1;
2417 } else { 2417 } else {
2418 if (pd->force_phy_addr || pd->phy_addr) { 2418 if (pd->phy_addr != MV643XX_ETH_PHY_ADDR_DEFAULT) {
2419 mp->phy_addr = pd->phy_addr & 0x3f; 2419 mp->phy_addr = pd->phy_addr & 0x3f;
2420 phy_addr_set(mp, mp->phy_addr); 2420 phy_addr_set(mp, mp->phy_addr);
2421 } else { 2421 } else {