net: phy: Make phy_ethtool_ksettings_get return void

Make return value void since function never return meaningfull value

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apm/xgene-v2/ethtool.c b/drivers/net/ethernet/apm/xgene-v2/ethtool.c
index b6666e418e79fd1c0bfc4f33a9b17e4c094c36b9..d31ad8270d93a887df9496427ef0cb07d4c7a2c7 100644 (file)
--- a/drivers/net/ethernet/apm/xgene-v2/ethtool.c
+++ b/drivers/net/ethernet/apm/xgene-v2/ethtool.c
@@ -157,7 +157,9 @@ static int xge_get_link_ksettings(struct net_device *ndev,
        if (!phydev)
                return -ENODEV;
 
-       return phy_ethtool_ksettings_get(phydev, cmd);
+       phy_ethtool_ksettings_get(phydev, cmd);
+
+       return 0;
 }
 
 static int xge_set_link_ksettings(struct net_device *ndev,

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 559963b1aa3243506f9c27f0636706bf13c50d64..4f50f11718f4b73bd8f883aa94b209c7a07d78c0 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -131,13 +131,17 @@ static int xgene_get_link_ksettings(struct net_device *ndev,
                if (phydev == NULL)
                        return -ENODEV;
 
-               return phy_ethtool_ksettings_get(phydev, cmd);
+               phy_ethtool_ksettings_get(phydev, cmd);
+
+               return 0;
        } else if (pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
                if (pdata->mdio_driver) {
                        if (!phydev)
                                return -ENODEV;
 
-                       return phy_ethtool_ksettings_get(phydev, cmd);
+                       phy_ethtool_ksettings_get(phydev, cmd);
+
+                       return 0;
                }
 
                supported = SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg |

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 5b95bb48ce97dd9c0d02968badb05949f7eb4214..f411936b744cb1fa4d331f7b439a181916fa118e 100644 (file)
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1836,7 +1836,9 @@ static int b44_get_link_ksettings(struct net_device *dev,
 
        if (bp->flags & B44_FLAG_EXTERNAL_PHY) {
                BUG_ON(!dev->phydev);
-               return phy_ethtool_ksettings_get(dev->phydev, cmd);
+               phy_ethtool_ksettings_get(dev->phydev, cmd);
+
+               return 0;
        }
 
        supported = (SUPPORTED_Autoneg);

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 50d88d3e03b68af9bb09f11b2aec09e7d2977c80..ea3c906fa0e43ab56edf491350ffe429048f0fe8 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1453,7 +1453,10 @@ static int bcm_enet_get_link_ksettings(struct net_device *dev,
        if (priv->has_phy) {
                if (!dev->phydev)
                        return -ENODEV;
-               return phy_ethtool_ksettings_get(dev->phydev, cmd);
+
+               phy_ethtool_ksettings_get(dev->phydev, cmd);
+
+               return 0;
        } else {
                cmd->base.autoneg = 0;
                cmd->base.speed = (priv->force_speed_100) ?

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index a205a9ff9e179ba9b5f854b9e9707a29b36a45bb..daca1c9d254be4b4f2b513f1754c7534c104c757 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -477,7 +477,9 @@ static int bcmgenet_get_link_ksettings(struct net_device *dev,
        if (!priv->phydev)
                return -ENODEV;
 
-       return phy_ethtool_ksettings_get(priv->phydev, cmd);
+       phy_ethtool_ksettings_get(priv->phydev, cmd);
+
+       return 0;
 }
 
 static int bcmgenet_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 537d571ee60171f303b52f692a83a3eecdeef358..d600c41fb1dc18c853e52ac1aa446c6d6d2f03b9 100644 (file)
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -12097,7 +12097,9 @@ static int tg3_get_link_ksettings(struct net_device *dev,
                if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                        return -EAGAIN;
                phydev = mdiobus_get_phy(tp->mdio_bus, tp->phy_addr);
-               return phy_ethtool_ksettings_get(phydev, cmd);
+               phy_ethtool_ksettings_get(phydev, cmd);
+
+               return 0;
        }
 
        supported = (SUPPORTED_Autoneg);

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
index 15571e251fb910c3f17d70c643c33ef894438a58..aad8250883573302fbe3e765594d7199572b6d1f 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
@@ -75,16 +75,14 @@ static char dpaa_stats_global[][ETH_GSTRING_LEN] = {
 static int dpaa_get_link_ksettings(struct net_device *net_dev,
                                   struct ethtool_link_ksettings *cmd)
 {
-       int err;
-
        if (!net_dev->phydev) {
                netdev_dbg(net_dev, "phy device not initialized\n");
                return 0;
        }
 
-       err = phy_ethtool_ksettings_get(net_dev->phydev, cmd);
+       phy_ethtool_ksettings_get(net_dev->phydev, cmd);
 
-       return err;
+       return 0;
 }
 
 static int dpaa_set_link_ksettings(struct net_device *net_dev,

diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index b642990b549c2c2414937bb9479f494b05971aec..4df282ed22c7962f7e10ab6d17be11b50a1ac44f 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -113,7 +113,9 @@ uec_get_ksettings(struct net_device *netdev, struct ethtool_link_ksettings *cmd)
        if (!phydev)
                return -ENODEV;
 
-       return phy_ethtool_ksettings_get(phydev, cmd);
+       phy_ethtool_ksettings_get(phydev, cmd);
+
+       return 0;
 }
 
 static int

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index b8fab149690f880394f0d973560aecca69d1171e..af1b15cc6a7f24ef5ed194db560cff2e73637ca3 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -150,7 +150,7 @@ static int hns_nic_get_link_ksettings(struct net_device *net_dev,
        cmd->base.duplex = duplex;
 
        if (net_dev->phydev)
-               (void)phy_ethtool_ksettings_get(net_dev->phydev, cmd);
+               phy_ethtool_ksettings_get(net_dev->phydev, cmd);
 
        link_stat = hns_nic_get_link(net_dev);
        if (!link_stat) {

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 25642dee49d328f0ab963d03d06e507bdbfeddbc..5794d98d946f35c132f010b58368a15b5534070d 100644 (file)
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1501,10 +1501,9 @@ mv643xx_eth_get_link_ksettings_phy(struct mv643xx_eth_private *mp,
                                   struct ethtool_link_ksettings *cmd)
 {
        struct net_device *dev = mp->dev;
-       int err;
        u32 supported, advertising;
 
-       err = phy_ethtool_ksettings_get(dev->phydev, cmd);
+       phy_ethtool_ksettings_get(dev->phydev, cmd);
 
        /*
         * The MAC does not support 1000baseT_Half.
@@ -1520,7 +1519,7 @@ mv643xx_eth_get_link_ksettings_phy(struct mv643xx_eth_private *mp,
        ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,
                                                advertising);
 
-       return err;
+       return 0;
 }
 
 static int

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 16f97552ae983b6f8e9df9fb4abf956764b49d28..962975d192d10c45f348453f4954071e5c2df03a 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2056,7 +2056,9 @@ static int mtk_get_link_ksettings(struct net_device *ndev,
        if (unlikely(test_bit(MTK_RESETTING, &mac->hw->state)))
                return -EBUSY;
 
-       return phy_ethtool_ksettings_get(ndev->phydev, cmd);
+       phy_ethtool_ksettings_get(ndev->phydev, cmd);
+
+       return 0;
 }
 
 static int mtk_set_link_ksettings(struct net_device *ndev,

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 784782da3a85b638e9e2a195fe66b15c72fe0fe5..5931e859876c2aee79d9a90e510a25aecab7f1ee 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1076,16 +1076,16 @@ static int ravb_get_link_ksettings(struct net_device *ndev,
                                   struct ethtool_link_ksettings *cmd)
 {
        struct ravb_private *priv = netdev_priv(ndev);
-       int error = -ENODEV;
        unsigned long flags;
 
-       if (ndev->phydev) {
-               spin_lock_irqsave(&priv->lock, flags);
-               error = phy_ethtool_ksettings_get(ndev->phydev, cmd);
-               spin_unlock_irqrestore(&priv->lock, flags);
-       }
+       if (!ndev->phydev)
+               return -ENODEV;
 
-       return error;
+       spin_lock_irqsave(&priv->lock, flags);
+       phy_ethtool_ksettings_get(ndev->phydev, cmd);
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return 0;
 }
 
 static int ravb_set_link_ksettings(struct net_device *ndev,

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 48b66df88294a4f26027bbead5c1b6418e4b0b45..d2dc0a8ef3056237d273128c34a75f66c1ee4c90 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1915,16 +1915,15 @@ static int sh_eth_get_link_ksettings(struct net_device *ndev,
 {
        struct sh_eth_private *mdp = netdev_priv(ndev);
        unsigned long flags;
-       int ret;
 
        if (!ndev->phydev)
                return -ENODEV;
 
        spin_lock_irqsave(&mdp->lock, flags);
-       ret = phy_ethtool_ksettings_get(ndev->phydev, cmd);
+       phy_ethtool_ksettings_get(ndev->phydev, cmd);
        spin_unlock_irqrestore(&mdp->lock, flags);
 
-       return ret;
+       return 0;
 }
 
 static int sh_eth_set_link_ksettings(struct net_device *ndev,

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 16808e48ca1cf7bbd4237967ce0497caffc52808..743170d57f62258f68faf4706d04113faea2fc70 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -273,7 +273,6 @@ static int stmmac_ethtool_get_link_ksettings(struct net_device *dev,
 {
        struct stmmac_priv *priv = netdev_priv(dev);
        struct phy_device *phy = dev->phydev;
-       int rc;
 
        if (priv->hw->pcs & STMMAC_PCS_RGMII ||
            priv->hw->pcs & STMMAC_PCS_SGMII) {
@@ -364,8 +363,8 @@ static int stmmac_ethtool_get_link_ksettings(struct net_device *dev,
                "link speed / duplex setting\n", dev->name);
                return -EBUSY;
        }
-       rc = phy_ethtool_ksettings_get(phy, cmd);
-       return rc;
+       phy_ethtool_ksettings_get(phy, cmd);
+       return 0;
 }
 
 static int

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index b6a0d92dd6377cd548b3c5e766ebd8a576833888..b7a0f5eeab620b30c5abcf8798f2bd3fdb2fb401 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2170,11 +2170,11 @@ static int cpsw_get_link_ksettings(struct net_device *ndev,
        struct cpsw_common *cpsw = priv->cpsw;
        int slave_no = cpsw_slave_index(cpsw, priv);
 
-       if (cpsw->slaves[slave_no].phy)
-               return phy_ethtool_ksettings_get(cpsw->slaves[slave_no].phy,
-                                                ecmd);
-       else
+       if (!cpsw->slaves[slave_no].phy)
                return -EOPNOTSUPP;
+
+       phy_ethtool_ksettings_get(cpsw->slaves[slave_no].phy, ecmd);
+       return 0;
 }
 
 static int cpsw_set_link_ksettings(struct net_device *ndev,

diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index dd92950a4615c3aab559c6dc383a4e90ee539160..0847a8f48cfe1d11d5001c1da2e0a33200a05116 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -1927,7 +1927,6 @@ static int keystone_get_link_ksettings(struct net_device *ndev,
        struct netcp_intf *netcp = netdev_priv(ndev);
        struct phy_device *phy = ndev->phydev;
        struct gbe_intf *gbe_intf;
-       int ret;
 
        if (!phy)
                return -EINVAL;
@@ -1939,11 +1938,10 @@ static int keystone_get_link_ksettings(struct net_device *ndev,
        if (!gbe_intf->slave)
                return -EINVAL;
 
-       ret = phy_ethtool_ksettings_get(phy, cmd);
-       if (!ret)
-               cmd->base.port = gbe_intf->slave->phy_port_t;
+       phy_ethtool_ksettings_get(phy, cmd);
+       cmd->base.port = gbe_intf->slave->phy_port_t;
 
-       return ret;
+       return 0;
 }
 
 static int keystone_set_link_ksettings(struct net_device *ndev,

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 14fc5bc75cd1136dd0330f0dc546912db668bcbc..edcdf0d872ed18fe309f4e393491a210b7fba74d 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -509,8 +509,8 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
 }
 EXPORT_SYMBOL(phy_ethtool_ksettings_set);
 
-int phy_ethtool_ksettings_get(struct phy_device *phydev,
-                             struct ethtool_link_ksettings *cmd)
+void phy_ethtool_ksettings_get(struct phy_device *phydev,
+                              struct ethtool_link_ksettings *cmd)
 {
        ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
                                                phydev->supported);
@@ -532,8 +532,6 @@ int phy_ethtool_ksettings_get(struct phy_device *phydev,
        cmd->base.autoneg = phydev->autoneg;
        cmd->base.eth_tp_mdix_ctrl = phydev->mdix_ctrl;
        cmd->base.eth_tp_mdix = phydev->mdix;
-
-       return 0;
 }
 EXPORT_SYMBOL(phy_ethtool_ksettings_get);
 
@@ -1449,7 +1447,9 @@ int phy_ethtool_get_link_ksettings(struct net_device *ndev,
        if (!phydev)
                return -ENODEV;
 
-       return phy_ethtool_ksettings_get(phydev, cmd);
+       phy_ethtool_ksettings_get(phydev, cmd);
+
+       return 0;
 }
 EXPORT_SYMBOL(phy_ethtool_get_link_ksettings);
 

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 9eff97a650ae5e3056f20e8c0f1bb717df4773ab..5833f7e2a127811aa2298ded2bc62b1d06ae1e9d 100644 (file)
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -1490,7 +1490,7 @@ static int lan78xx_get_link_ksettings(struct net_device *net,
        if (ret < 0)
                return ret;
 
-       ret = phy_ethtool_ksettings_get(phydev, cmd);
+       phy_ethtool_ksettings_get(phydev, cmd);
 
        usb_autopm_put_interface(dev->intf);
 

diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index 781ef623233e769eb70a649a33049a2c00cb86cc..e05ae4645d91b1dff6c5ae38f3aab898268a66be 100644 (file)
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -179,7 +179,10 @@ static int xlr_get_link_ksettings(struct net_device *ndev,
 
        if (!phydev)
                return -ENODEV;
-       return phy_ethtool_ksettings_get(phydev, ecmd);
+
+       phy_ethtool_ksettings_get(phydev, ecmd);
+
+       return 0;
 }
 
 static int xlr_set_link_ksettings(struct net_device *ndev,

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 51bea659340950f3b7a23417455211f92f456528..23d2e46dd322992e1ed4326241d39e0fa8cb47da 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -872,8 +872,8 @@ void phy_start_machine(struct phy_device *phydev);
 void phy_stop_machine(struct phy_device *phydev);
 void phy_trigger_machine(struct phy_device *phydev, bool sync);
 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
-int phy_ethtool_ksettings_get(struct phy_device *phydev,
-                             struct ethtool_link_ksettings *cmd);
+void phy_ethtool_ksettings_get(struct phy_device *phydev,
+                              struct ethtool_link_ksettings *cmd);
 int phy_ethtool_ksettings_set(struct phy_device *phydev,
                              const struct ethtool_link_ksettings *cmd);
 int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 5f3caee725eec423307a336c65c9280d247b9986..5e45ae5c3f710e1536240b2c3a0f57b210c33e49 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -387,12 +387,13 @@ dsa_slave_get_link_ksettings(struct net_device *dev,
                             struct ethtool_link_ksettings *cmd)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
-       int err = -EOPNOTSUPP;
 
-       if (p->phy != NULL)
-               err = phy_ethtool_ksettings_get(p->phy, cmd);
+       if (!p->phy)
+               return -EOPNOTSUPP;
 
-       return err;
+       phy_ethtool_ksettings_get(p->phy, cmd);
+
+       return 0;
 }
 
 static int