diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-01-13 19:52:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-14 15:11:50 -0500 |
commit | f9a8f83b04e0c362a2fc660dbad980d24af209fc (patch) | |
tree | 055b2c8f2d32f3cfd0dc84fd3f8d971a34aeed85 /drivers/net/ethernet/dnet.c | |
parent | c1b52739e45f5969b208ebc377f52468280af11e (diff) |
net: phy: remove flags argument from phy_{attach, connect, connect_direct}
The flags argument of the phy_{attach,connect,connect_direct} functions
is then used to assign a struct phy_device dev_flags with its value.
All callers but the tg3 driver pass the flag 0, which results in the
underlying PHY drivers in drivers/net/phy/ not being able to actually
use any of the flags they would set in dev_flags. This patch gets rid of
the flags argument, and passes phydev->dev_flags to the internal PHY
library call phy_attach_direct() such that drivers which actually modify
a phy device dev_flags get the value preserved for use by the underlying
phy driver.
Acked-by: Kosta Zertsekel <konszert@marvell.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/dnet.c')
-rw-r--r-- | drivers/net/ethernet/dnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c index 2c177b329c8b..f3d60eb13c3a 100644 --- a/drivers/net/ethernet/dnet.c +++ b/drivers/net/ethernet/dnet.c | |||
@@ -281,11 +281,11 @@ static int dnet_mii_probe(struct net_device *dev) | |||
281 | /* attach the mac to the phy */ | 281 | /* attach the mac to the phy */ |
282 | if (bp->capabilities & DNET_HAS_RMII) { | 282 | if (bp->capabilities & DNET_HAS_RMII) { |
283 | phydev = phy_connect(dev, dev_name(&phydev->dev), | 283 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
284 | &dnet_handle_link_change, 0, | 284 | &dnet_handle_link_change, |
285 | PHY_INTERFACE_MODE_RMII); | 285 | PHY_INTERFACE_MODE_RMII); |
286 | } else { | 286 | } else { |
287 | phydev = phy_connect(dev, dev_name(&phydev->dev), | 287 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
288 | &dnet_handle_link_change, 0, | 288 | &dnet_handle_link_change, |
289 | PHY_INTERFACE_MODE_MII); | 289 | PHY_INTERFACE_MODE_MII); |
290 | } | 290 | } |
291 | 291 | ||