net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return...

Make return value void since functions never returns meaningfull value.

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index da020418a6526bed0465eeaa67a3fd61d83afb34..017f48cdcab9d96f12f74a03507b27913c49df2e 100644 (file)
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1417,10 +1417,9 @@ static int e100_get_link_ksettings(struct net_device *dev,
 {
        struct net_local *np = netdev_priv(dev);
        u32 supported;
-       int err;
 
        spin_lock_irq(&np->lock);
-       err = mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
        spin_unlock_irq(&np->lock);
 
        /* The PHY may support 1000baseT, but the Etrax100 does not.  */
@@ -1432,7 +1431,7 @@ static int e100_get_link_ksettings(struct net_device *dev,
        ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
                                                supported);
 
-       return err;
+       return 0;
 }
 
 static int e100_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index e41245a54f8bfc6949c0c1cc0b3fe63438d16605..14cff6017756c7db50669a582d1a920da26e7842 100644 (file)
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -2912,7 +2912,9 @@ static int vortex_get_link_ksettings(struct net_device *dev,
 {
        struct vortex_private *vp = netdev_priv(dev);
 
-       return mii_ethtool_get_link_ksettings(&vp->mii, cmd);
+       mii_ethtool_get_link_ksettings(&vp->mii, cmd);
+
+       return 0;
 }
 
 static int vortex_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 86369d7c9a0ff5221a424d44ed20022c3ea9cb44..7f60d17819cea4db52eef5650dab39d6ac936d1d 100644 (file)
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -731,12 +731,10 @@ static int pcnet32_get_link_ksettings(struct net_device *dev,
 {
        struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
-       int r = -EOPNOTSUPP;
 
        spin_lock_irqsave(&lp->lock, flags);
        if (lp->mii) {
                mii_ethtool_get_link_ksettings(&lp->mii_if, cmd);
-               r = 0;
        } else if (lp->chip_version == PCNET32_79C970A) {
                if (lp->autoneg) {
                        cmd->base.autoneg = AUTONEG_ENABLE;
@@ -753,10 +751,9 @@ static int pcnet32_get_link_ksettings(struct net_device *dev,
                ethtool_convert_legacy_u32_to_link_mode(
                                                cmd->link_modes.supported,
                                                SUPPORTED_TP | SUPPORTED_AUI);
-               r = 0;
        }
        spin_unlock_irqrestore(&lp->lock, flags);
-       return r;
+       return 0;
 }
 
 static int pcnet32_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index 7a7c02f1f8b955f28206855f7084630cf8b35c2a..e2a702996db41f073879b91475c24c249292955a 100644 (file)
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -702,7 +702,10 @@ static int ep93xx_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct ep93xx_priv *ep = netdev_priv(dev);
-       return mii_ethtool_get_link_ksettings(&ep->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&ep->mii, cmd);
+
+       return 0;
 }
 
 static int ep93xx_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index d1f2f3cc7cfaa760a826fb8820c91c4a07ed18cd..32d7229544faeb13fde6a887ced18f1f58b4aeab 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -1395,13 +1395,12 @@ static int netdev_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct netdev_private *np = netdev_priv(dev);
-       int rc;
 
        spin_lock_irq(&np->lock);
-       rc = mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&np->mii_if, cmd);
        spin_unlock_irq(&np->lock);
 
-       return rc;
+       return 0;
 }
 
 static int netdev_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index 1536356e2ea89ffaaf52974f1ed46b97ea861ae6..66928a922824fd24513941da53540d71e0dad8a4 100644 (file)
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -829,7 +829,10 @@ static int ftmac100_get_link_ksettings(struct net_device *netdev,
                                       struct ethtool_link_ksettings *cmd)
 {
        struct ftmac100 *priv = netdev_priv(netdev);
-       return mii_ethtool_get_link_ksettings(&priv->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&priv->mii, cmd);
+
+       return 0;
 }
 
 static int ftmac100_set_link_ksettings(struct net_device *netdev,

diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 766636a7c25e23167e5185cbe6f2c6bd6d9da043..610f9c07c21df4e3c96ff141e2e5f40b381db6e8 100644 (file)
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -1821,13 +1821,12 @@ static int netdev_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct netdev_private *np = netdev_priv(dev);
-       int rc;
 
        spin_lock_irq(&np->lock);
-       rc = mii_ethtool_get_link_ksettings(&np->mii, cmd);
+       mii_ethtool_get_link_ksettings(&np->mii, cmd);
        spin_unlock_irq(&np->lock);
 
-       return rc;
+       return 0;
 }
 
 static int netdev_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 2b7323d392dcc542430ced19c4ed5448bc274cdc..4d10270ddf8fb6e4c0d40e8537eba0f8f534f1bf 100644 (file)
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2430,7 +2430,10 @@ static int e100_get_link_ksettings(struct net_device *netdev,
                                   struct ethtool_link_ksettings *cmd)
 {
        struct nic *nic = netdev_priv(netdev);
-       return mii_ethtool_get_link_ksettings(&nic->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&nic->mii, cmd);
+
+       return 0;
 }
 
 static int e100_set_link_ksettings(struct net_device *netdev,

diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index 0e5083a48937738c18f825c2a19105ef0060bafe..62d848df26ef8656b4b5c94340a95ac7dd77149d 100644 (file)
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -2610,12 +2610,11 @@ jme_get_link_ksettings(struct net_device *netdev,
                       struct ethtool_link_ksettings *cmd)
 {
        struct jme_adapter *jme = netdev_priv(netdev);
-       int rc;
 
        spin_lock_bh(&jme->phy_lock);
-       rc = mii_ethtool_get_link_ksettings(&jme->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&jme->mii_if, cmd);
        spin_unlock_bh(&jme->phy_lock);
-       return rc;
+       return 0;
 }
 
 static int

diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index 9fae98caf83a378da959eb0cd70211f3c5d93f7b..3c0a6451273df3464cadf39fbea78787f4907725 100644 (file)
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -699,13 +699,12 @@ static int netdev_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct korina_private *lp = netdev_priv(dev);
-       int rc;
 
        spin_lock_irq(&lp->lock);
-       rc = mii_ethtool_get_link_ksettings(&lp->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&lp->mii_if, cmd);
        spin_unlock_irq(&lp->lock);
 
-       return rc;
+       return 0;
 }
 
 static int netdev_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 20358f87de57053b6e8a0cdd5078334260e1be6b..2fe96f1f3fe5cae8438cf23dada52c0a616a7a37 100644 (file)
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1071,7 +1071,10 @@ static int ks8851_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct ks8851_net *ks = netdev_priv(dev);
-       return mii_ethtool_get_link_ksettings(&ks->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&ks->mii, cmd);
+
+       return 0;
 }
 
 static int ks8851_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 7647f7bdbcb89527fd709405a339ea6ef0b129fc..f3e9dd47b56f03a5d856e2a89ad9c164000a8ce1 100644 (file)
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1315,7 +1315,10 @@ static int ks_get_link_ksettings(struct net_device *netdev,
                                 struct ethtool_link_ksettings *cmd)
 {
        struct ks_net *ks = netdev_priv(netdev);
-       return mii_ethtool_get_link_ksettings(&ks->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&ks->mii, cmd);
+
+       return 0;
 }
 
 static int ks_set_link_ksettings(struct net_device *netdev,

diff --git a/drivers/net/ethernet/nuvoton/w90p910_ether.c b/drivers/net/ethernet/nuvoton/w90p910_ether.c
index 159564d8dcdb5cd1ec5d6cd02049e380d7b73e44..89ab786da25f7545353ef9c1911cb9916dad3b57 100644 (file)
--- a/drivers/net/ethernet/nuvoton/w90p910_ether.c
+++ b/drivers/net/ethernet/nuvoton/w90p910_ether.c
@@ -868,7 +868,10 @@ static int w90p910_get_link_ksettings(struct net_device *dev,
                                      struct ethtool_link_ksettings *cmd)
 {
        struct w90p910_ether *ether = netdev_priv(dev);
-       return mii_ethtool_get_link_ksettings(&ether->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&ether->mii, cmd);
+
+       return 0;
 }
 
 static int w90p910_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
index 21093276d2b7519681435739f19ed475dc0814f7..731ce1e419e45971574d71c607e165d13daf4974 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
@@ -85,9 +85,8 @@ static int pch_gbe_get_link_ksettings(struct net_device *netdev,
 {
        struct pch_gbe_adapter *adapter = netdev_priv(netdev);
        u32 supported, advertising;
-       int ret;
 
-       ret = mii_ethtool_get_link_ksettings(&adapter->mii, ecmd);
+       mii_ethtool_get_link_ksettings(&adapter->mii, ecmd);
 
        ethtool_convert_link_mode_to_legacy_u32(&supported,
                                                ecmd->link_modes.supported);
@@ -104,7 +103,8 @@ static int pch_gbe_get_link_ksettings(struct net_device *netdev,
 
        if (!netif_carrier_ok(adapter->netdev))
                ecmd->base.speed = SPEED_UNKNOWN;
-       return ret;
+
+       return 0;
 }
 
 /**

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 72233ab9474b1263271c772691c5c35cc245a63e..e7ab23e87de2f4e51145d975904ef32b2c8c300c 100644 (file)
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -1410,14 +1410,13 @@ static int cp_get_link_ksettings(struct net_device *dev,
                                 struct ethtool_link_ksettings *cmd)
 {
        struct cp_private *cp = netdev_priv(dev);
-       int rc;
        unsigned long flags;
 
        spin_lock_irqsave(&cp->lock, flags);
-       rc = mii_ethtool_get_link_ksettings(&cp->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&cp->mii_if, cmd);
        spin_unlock_irqrestore(&cp->lock, flags);
 
-       return rc;
+       return 0;
 }
 
 static int cp_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 0a8f2817ea60f2172eb28177473a4879f85bd18a..bd07a15d3b7c09886de55af99a45975ac3401219 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -2148,7 +2148,9 @@ static int rtl8169_get_link_ksettings_xmii(struct net_device *dev,
 {
        struct rtl8169_private *tp = netdev_priv(dev);
 
-       return mii_ethtool_get_link_ksettings(&tp->mii, cmd);
+       mii_ethtool_get_link_ksettings(&tp->mii, cmd);
+
+       return 0;
 }
 
 static int rtl8169_get_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 52ead5524de76b8de6581c2fea8bc69d6ccebcb7..b607936e1b3ec4ae93225106ac0eb53e15c892a6 100644 (file)
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1562,13 +1562,12 @@ static int ioc3_get_link_ksettings(struct net_device *dev,
                                   struct ethtool_link_ksettings *cmd)
 {
        struct ioc3_private *ip = netdev_priv(dev);
-       int rc;
 
        spin_lock_irq(&ip->ioc3_lock);
-       rc = mii_ethtool_get_link_ksettings(&ip->mii, cmd);
+       mii_ethtool_get_link_ksettings(&ip->mii, cmd);
        spin_unlock_irq(&ip->ioc3_lock);
 
-       return rc;
+       return 0;
 }
 
 static int ioc3_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index 02da106c6e04e8a59ff001575fd29cda851435cf..445109bd6910b6365d18c66ca7bffb2348d5e810 100644 (file)
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -1739,7 +1739,9 @@ static int sis190_get_link_ksettings(struct net_device *dev,
 {
        struct sis190_private *tp = netdev_priv(dev);
 
-       return mii_ethtool_get_link_ksettings(&tp->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&tp->mii_if, cmd);
+
+       return 0;
 }
 
 static int sis190_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index db6dcb06193d3dbce7243287800f54c28b198d7d..6a0e1d4b597c8e7e9fe8086d3a476ebc717b9e91 100644 (file)
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -1391,13 +1391,12 @@ static int netdev_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct epic_private *np = netdev_priv(dev);
-       int rc;
 
        spin_lock_irq(&np->lock);
-       rc = mii_ethtool_get_link_ksettings(&np->mii, cmd);
+       mii_ethtool_get_link_ksettings(&np->mii, cmd);
        spin_unlock_irq(&np->lock);
 
-       return rc;
+       return 0;
 }
 
 static int netdev_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c
index 36307d34f64181d03e744352d56681b33b111b1f..05157442a9807f41c3ac45ba6fc7f74e37bba95a 100644 (file)
--- a/drivers/net/ethernet/smsc/smc911x.c
+++ b/drivers/net/ethernet/smsc/smc911x.c
@@ -1450,7 +1450,7 @@ smc911x_ethtool_get_link_ksettings(struct net_device *dev,
                                   struct ethtool_link_ksettings *cmd)
 {
        struct smc911x_local *lp = netdev_priv(dev);
-       int ret, status;
+       int status;
        unsigned long flags;
        u32 supported;
 
@@ -1458,7 +1458,7 @@ smc911x_ethtool_get_link_ksettings(struct net_device *dev,
 
        if (lp->phy_type != 0) {
                spin_lock_irqsave(&lp->lock, flags);
-               ret = mii_ethtool_get_link_ksettings(&lp->mii, cmd);
+               mii_ethtool_get_link_ksettings(&lp->mii, cmd);
                spin_unlock_irqrestore(&lp->lock, flags);
        } else {
                supported = SUPPORTED_10baseT_Half |
@@ -1480,10 +1480,9 @@ smc911x_ethtool_get_link_ksettings(struct net_device *dev,
                ethtool_convert_legacy_u32_to_link_mode(
                        cmd->link_modes.supported, supported);
 
-               ret = 0;
        }
 
-       return ret;
+       return 0;
 }
 
 static int

diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
index 976aa876789a5731df5f50136ff7284dd2ab1258..92c927aec66db8938289f7bbab32dce24926254b 100644 (file)
--- a/drivers/net/ethernet/smsc/smc91c92_cs.c
+++ b/drivers/net/ethernet/smsc/smc91c92_cs.c
@@ -1843,8 +1843,8 @@ static int smc_link_ok(struct net_device *dev)
     }
 }
 
-static int smc_netdev_get_ecmd(struct net_device *dev,
-                              struct ethtool_link_ksettings *ecmd)
+static void smc_netdev_get_ecmd(struct net_device *dev,
+                               struct ethtool_link_ksettings *ecmd)
 {
        u16 tmp;
        unsigned int ioaddr = dev->base_addr;
@@ -1865,8 +1865,6 @@ static int smc_netdev_get_ecmd(struct net_device *dev,
 
        ethtool_convert_legacy_u32_to_link_mode(ecmd->link_modes.supported,
                                                supported);
-
-       return 0;
 }
 
 static int smc_netdev_set_ecmd(struct net_device *dev,
@@ -1918,18 +1916,17 @@ static int smc_get_link_ksettings(struct net_device *dev,
        struct smc_private *smc = netdev_priv(dev);
        unsigned int ioaddr = dev->base_addr;
        u16 saved_bank = inw(ioaddr + BANK_SELECT);
-       int ret;
        unsigned long flags;
 
        spin_lock_irqsave(&smc->lock, flags);
        SMC_SELECT_BANK(3);
        if (smc->cfg & CFG_MII_SELECT)
-               ret = mii_ethtool_get_link_ksettings(&smc->mii_if, ecmd);
+               mii_ethtool_get_link_ksettings(&smc->mii_if, ecmd);
        else
-               ret = smc_netdev_get_ecmd(dev, ecmd);
+               smc_netdev_get_ecmd(dev, ecmd);
        SMC_SELECT_BANK(saved_bank);
        spin_unlock_irqrestore(&smc->lock, flags);
-       return ret;
+       return 0;
 }
 
 static int smc_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 91e9bd7159ab37cab5731fef122345cb59341ba2..0d230b125c6c8576c7eeecf06703a6de3288ce5a 100644 (file)
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -1539,11 +1539,10 @@ smc_ethtool_get_link_ksettings(struct net_device *dev,
                               struct ethtool_link_ksettings *cmd)
 {
        struct smc_local *lp = netdev_priv(dev);
-       int ret;
 
        if (lp->phy_type != 0) {
                spin_lock_irq(&lp->lock);
-               ret = mii_ethtool_get_link_ksettings(&lp->mii, cmd);
+               mii_ethtool_get_link_ksettings(&lp->mii, cmd);
                spin_unlock_irq(&lp->lock);
        } else {
                u32 supported = SUPPORTED_10baseT_Half |
@@ -1562,11 +1561,9 @@ smc_ethtool_get_link_ksettings(struct net_device *dev,
 
                ethtool_convert_legacy_u32_to_link_mode(
                        cmd->link_modes.supported, supported);
-
-               ret = 0;
        }
 
-       return ret;
+       return 0;
 }
 
 static int

diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 5ac6eaa9e78510a2c28cf2506dd791ece82b3009..c2d15d9c0c33be91385797b0389bb8b89f64cc41 100644 (file)
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1504,13 +1504,12 @@ static int tsi108_get_link_ksettings(struct net_device *dev,
 {
        struct tsi108_prv_data *data = netdev_priv(dev);
        unsigned long flags;
-       int rc;
 
        spin_lock_irqsave(&data->txlock, flags);
-       rc = mii_ethtool_get_link_ksettings(&data->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&data->mii_if, cmd);
        spin_unlock_irqrestore(&data->txlock, flags);
 
-       return rc;
+       return 0;
 }
 
 static int tsi108_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 4cf41f779d0ef4ef8d6cf2fa688abd97b3e8264d..acd29d60174ad9770f27cfd3d3fb73198df102eb 100644 (file)
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2307,13 +2307,12 @@ static int netdev_get_link_ksettings(struct net_device *dev,
                                     struct ethtool_link_ksettings *cmd)
 {
        struct rhine_private *rp = netdev_priv(dev);
-       int rc;
 
        mutex_lock(&rp->task_lock);
-       rc = mii_ethtool_get_link_ksettings(&rp->mii_if, cmd);
+       mii_ethtool_get_link_ksettings(&rp->mii_if, cmd);
        mutex_unlock(&rp->task_lock);
 
-       return rc;
+       return 0;
 }
 
 static int netdev_set_link_ksettings(struct net_device *dev,

diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index 6d953c53eed6c86d9c6db39704a374ee5fac1bde..44612122338bba29be8a0160169c877b237668af 100644 (file)
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -141,11 +141,9 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
  *
  * The @cmd parameter is expected to have been cleared before calling
  * mii_ethtool_get_link_ksettings().
- *
- * Returns 0 for success, negative on error.
  */
-int mii_ethtool_get_link_ksettings(struct mii_if_info *mii,
-                                  struct ethtool_link_ksettings *cmd)
+void mii_ethtool_get_link_ksettings(struct mii_if_info *mii,
+                                   struct ethtool_link_ksettings *cmd)
 {
        struct net_device *dev = mii->dev;
        u16 bmcr, bmsr, ctrl1000 = 0, stat1000 = 0;
@@ -227,8 +225,6 @@ int mii_ethtool_get_link_ksettings(struct mii_if_info *mii,
                                                lp_advertising);
 
        /* ignore maxtxpkt, maxrxpkt for now */
-
-       return 0;
 }
 
 /**

diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 51cf60092a18e33924f52c568d91a33f30828b21..793ce900dffa09fd5c13410d56a99382d63ca2d0 100644 (file)
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -624,7 +624,10 @@ static int ax88179_get_link_ksettings(struct net_device *net,
                                      struct ethtool_link_ksettings *cmd)
 {
        struct usbnet *dev = netdev_priv(net);
-       return mii_ethtool_get_link_ksettings(&dev->mii, cmd);
+
+       mii_ethtool_get_link_ksettings(&dev->mii, cmd);
+
+       return 0;
 }
 
 static int ax88179_set_link_ksettings(struct net_device *net,

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index e902df9595b9adca1e50fba93c6456b6d94f649a..fd31fab2a9daebb842784220a3a1950221e1e759 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3835,7 +3835,7 @@ int rtl8152_get_link_ksettings(struct net_device *netdev,
 
        mutex_lock(&tp->control);
 
-       ret = mii_ethtool_get_link_ksettings(&tp->mii, cmd);
+       mii_ethtool_get_link_ksettings(&tp->mii, cmd);
 
        mutex_unlock(&tp->control);
 

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 79048e72c1bd7d2f6c54b1a17efadc283571c408..6510e5cc1817cf560c1e4cd6fe5791f8f4b48bc5 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -956,7 +956,9 @@ int usbnet_get_link_ksettings(struct net_device *net,
        if (!dev->mii.mdio_read)
                return -EOPNOTSUPP;
 
-       return mii_ethtool_get_link_ksettings(&dev->mii, cmd);
+       mii_ethtool_get_link_ksettings(&dev->mii, cmd);
+
+       return 0;
 }
 EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings);
 

diff --git a/include/linux/mii.h b/include/linux/mii.h
index 1629a0c32679d907da9984f6fc4b211d472ca875..e870bfa6abfebee71051aecf237f8de03c1b2532 100644 (file)
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -31,7 +31,7 @@ struct mii_if_info {
 extern int mii_link_ok (struct mii_if_info *mii);
 extern int mii_nway_restart (struct mii_if_info *mii);
 extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
-extern int mii_ethtool_get_link_ksettings(
+extern void mii_ethtool_get_link_ksettings(
        struct mii_if_info *mii, struct ethtool_link_ksettings *cmd);
 extern int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
 extern int mii_ethtool_set_link_ksettings(