Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / net / ethernet / aeroflex / greth.c

diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index bca07c5c94bdf255f27846812feb12232aac1b08..f8df8248035ec8f6ba7f14aab225b6e7cb3dba64 100644 (file)
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1105,27 +1105,6 @@ static void greth_set_msglevel(struct net_device *dev, u32 value)
        struct greth_private *greth = netdev_priv(dev);
        greth->msg_enable = value;
 }
-static int greth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct greth_private *greth = netdev_priv(dev);
-       struct phy_device *phy = greth->phy;
-
-       if (!phy)
-               return -ENODEV;
-
-       return phy_ethtool_gset(phy, cmd);
-}
-
-static int greth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct greth_private *greth = netdev_priv(dev);
-       struct phy_device *phy = greth->phy;
-
-       if (!phy)
-               return -ENODEV;
-
-       return phy_ethtool_sset(phy, cmd);
-}
 
 static int greth_get_regs_len(struct net_device *dev)
 {
@@ -1157,12 +1136,12 @@ static void greth_get_regs(struct net_device *dev, struct ethtool_regs *regs, vo
 static const struct ethtool_ops greth_ethtool_ops = {
        .get_msglevel           = greth_get_msglevel,
        .set_msglevel           = greth_set_msglevel,
-       .get_settings           = greth_get_settings,
-       .set_settings           = greth_set_settings,
        .get_drvinfo            = greth_get_drvinfo,
        .get_regs_len           = greth_get_regs_len,
        .get_regs               = greth_get_regs,
        .get_link               = ethtool_op_get_link,
+       .get_link_ksettings     = phy_ethtool_get_link_ksettings,
+       .set_link_ksettings     = phy_ethtool_set_link_ksettings,
 };
 
 static struct net_device_ops greth_netdev_ops = {
@@ -1224,7 +1203,7 @@ static int greth_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
 static void greth_link_change(struct net_device *dev)
 {
        struct greth_private *greth = netdev_priv(dev);
-       struct phy_device *phydev = greth->phy;
+       struct phy_device *phydev = dev->phydev;
        unsigned long flags;
        int status_change = 0;
        u32 ctrl;
@@ -1307,7 +1286,6 @@ static int greth_mdio_probe(struct net_device *dev)
        greth->link = 0;
        greth->speed = 0;
        greth->duplex = -1;
-       greth->phy = phy;
 
        return 0;
 }
@@ -1325,6 +1303,7 @@ static int greth_mdio_init(struct greth_private *greth)
 {
        int ret;
        unsigned long timeout;
+       struct net_device *ndev = greth->netdev;
 
        greth->mdio = mdiobus_alloc();
        if (!greth->mdio) {
@@ -1349,15 +1328,16 @@ static int greth_mdio_init(struct greth_private *greth)
                goto unreg_mdio;
        }
 
-       phy_start(greth->phy);
+       phy_start(ndev->phydev);
 
        /* If Ethernet debug link is used make autoneg happen right away */
        if (greth->edcl && greth_edcl == 1) {
-               phy_start_aneg(greth->phy);
+               phy_start_aneg(ndev->phydev);
                timeout = jiffies + 6*HZ;
-               while (!phy_aneg_done(greth->phy) && time_before(jiffies, timeout)) {
+               while (!phy_aneg_done(ndev->phydev) &&
+                      time_before(jiffies, timeout)) {
                }
-               phy_read_status(greth->phy);
+               phy_read_status(ndev->phydev);
                greth_link_change(greth->netdev);
        }
 
@@ -1569,8 +1549,8 @@ static int greth_of_remove(struct platform_device *of_dev)
 
        dma_free_coherent(&of_dev->dev, 1024, greth->tx_bd_base, greth->tx_bd_base_phys);
 
-       if (greth->phy)
-               phy_stop(greth->phy);
+       if (ndev->phydev)
+               phy_stop(ndev->phydev);
        mdiobus_unregister(greth->mdio);
 
        unregister_netdev(ndev);