aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa/slave.c
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-13 19:52:52 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-14 15:11:50 -0500
commitf9a8f83b04e0c362a2fc660dbad980d24af209fc (patch)
tree055b2c8f2d32f3cfd0dc84fd3f8d971a34aeed85 /net/dsa/slave.c
parentc1b52739e45f5969b208ebc377f52468280af11e (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 'net/dsa/slave.c')
-rw-r--r--net/dsa/slave.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index f795b0ca7ee6..f4345582a6b9 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -391,7 +391,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
391 391
392 if (p->phy != NULL) { 392 if (p->phy != NULL) {
393 phy_attach(slave_dev, dev_name(&p->phy->dev), 393 phy_attach(slave_dev, dev_name(&p->phy->dev),
394 0, PHY_INTERFACE_MODE_GMII); 394 PHY_INTERFACE_MODE_GMII);
395 395
396 p->phy->autoneg = AUTONEG_ENABLE; 396 p->phy->autoneg = AUTONEG_ENABLE;
397 p->phy->speed = 0; 397 p->phy->speed = 0;