IB/mlx4: avoid a -Wmaybe-uninitialize warning

[cascardo/linux.git] / drivers / net / ethernet / ethoc.c

diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 4466a11..c044667 100644 (file)
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -192,7 +192,6 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
  * @napi:      NAPI structure
  * @msg_enable:        device state flags
  * @lock:      device lock
- * @phy:       attached PHY
  * @mdio:      MDIO bus for PHY access
  * @phy_id:    address of attached PHY
  */
@@ -219,7 +218,6 @@ struct ethoc {
 
        spinlock_t lock;
 
-       struct phy_device *phy;
        struct mii_bus *mdio;
        struct clk *clk;
        s8 phy_id;
@@ -694,7 +692,6 @@ static int ethoc_mdio_probe(struct net_device *dev)
                return err;
        }
 
-       priv->phy = phy;
        phy->advertising &= ~(ADVERTISED_1000baseT_Full |
                              ADVERTISED_1000baseT_Half);
        phy->supported &= ~(SUPPORTED_1000baseT_Full |
@@ -724,7 +721,7 @@ static int ethoc_open(struct net_device *dev)
                netif_start_queue(dev);
        }
 
-       phy_start(priv->phy);
+       phy_start(dev->phydev);
        napi_enable(&priv->napi);
 
        if (netif_msg_ifup(priv)) {
@@ -741,8 +738,8 @@ static int ethoc_stop(struct net_device *dev)
 
        napi_disable(&priv->napi);
 
-       if (priv->phy)
-               phy_stop(priv->phy);
+       if (dev->phydev)
+               phy_stop(dev->phydev);
 
        ethoc_disable_rx_and_tx(priv);
        free_irq(dev->irq, dev);
@@ -770,7 +767,7 @@ static int ethoc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (!phy)
                        return -ENODEV;
        } else {
-               phy = priv->phy;
+               phy = dev->phydev;
        }
 
        return phy_mii_ioctl(phy, ifr, cmd);
@@ -903,28 +900,6 @@ out_no_free:
        return NETDEV_TX_OK;
 }
 
-static int ethoc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct ethoc *priv = netdev_priv(dev);
-       struct phy_device *phydev = priv->phy;
-
-       if (!phydev)
-               return -EOPNOTSUPP;
-
-       return phy_ethtool_gset(phydev, cmd);
-}
-
-static int ethoc_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct ethoc *priv = netdev_priv(dev);
-       struct phy_device *phydev = priv->phy;
-
-       if (!phydev)
-               return -EOPNOTSUPP;
-
-       return phy_ethtool_sset(phydev, cmd);
-}
-
 static int ethoc_get_regs_len(struct net_device *netdev)
 {
        return ETH_END;
@@ -989,14 +964,14 @@ static int ethoc_set_ringparam(struct net_device *dev,
 }
 
 const struct ethtool_ops ethoc_ethtool_ops = {
-       .get_settings = ethoc_get_settings,
-       .set_settings = ethoc_set_settings,
        .get_regs_len = ethoc_get_regs_len,
        .get_regs = ethoc_get_regs,
        .get_link = ethtool_op_get_link,
        .get_ringparam = ethoc_get_ringparam,
        .set_ringparam = ethoc_set_ringparam,
        .get_ts_info = ethtool_op_get_ts_info,
+       .get_link_ksettings = phy_ethtool_get_link_ksettings,
+       .set_link_ksettings = phy_ethtool_set_link_ksettings,
 };
 
 static const struct net_device_ops ethoc_netdev_ops = {
@@ -1267,8 +1242,7 @@ static int ethoc_remove(struct platform_device *pdev)
 
        if (netdev) {
                netif_napi_del(&priv->napi);
-               phy_disconnect(priv->phy);
-               priv->phy = NULL;
+               phy_disconnect(netdev->phydev);
 
                if (priv->mdio) {
                        mdiobus_unregister(priv->mdio);