aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/smsc/smsc911x.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 /drivers/net/ethernet/smsc/smsc911x.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 'drivers/net/ethernet/smsc/smsc911x.c')
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 04ff63cb6544..da5cc9a3b34c 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -997,9 +997,8 @@ static int smsc911x_mii_probe(struct net_device *dev)
997 SMSC_TRACE(pdata, probe, "PHY: addr %d, phy_id 0x%08X", 997 SMSC_TRACE(pdata, probe, "PHY: addr %d, phy_id 0x%08X",
998 phydev->addr, phydev->phy_id); 998 phydev->addr, phydev->phy_id);
999 999
1000 ret = phy_connect_direct(dev, phydev, 1000 ret = phy_connect_direct(dev, phydev, &smsc911x_phy_adjust_link,
1001 &smsc911x_phy_adjust_link, 0, 1001 pdata->config.phy_interface);
1002 pdata->config.phy_interface);
1003 1002
1004 if (ret) { 1003 if (ret) {
1005 netdev_err(dev, "Could not attach to PHY\n"); 1004 netdev_err(dev, "Could not attach to PHY\n");