Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

yuval.shaia@oracle.com and committed by
David S. Miller
82c01a84 c7c6b871

+78 -73
+2 -3
drivers/net/cris/eth_v10.c
··· 1417 1417 { 1418 1418 struct net_local *np = netdev_priv(dev); 1419 1419 u32 supported; 1420 - int err; 1421 1420 1422 1421 spin_lock_irq(&np->lock); 1423 - err = mii_ethtool_get_link_ksettings(&np->mii_if, cmd); 1422 + mii_ethtool_get_link_ksettings(&np->mii_if, cmd); 1424 1423 spin_unlock_irq(&np->lock); 1425 1424 1426 1425 /* The PHY may support 1000baseT, but the Etrax100 does not. */ ··· 1431 1432 ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, 1432 1433 supported); 1433 1434 1434 - return err; 1435 + return 0; 1435 1436 } 1436 1437 1437 1438 static int e100_set_link_ksettings(struct net_device *dev,
+3 -1
drivers/net/ethernet/3com/3c59x.c
··· 2912 2912 { 2913 2913 struct vortex_private *vp = netdev_priv(dev); 2914 2914 2915 - return mii_ethtool_get_link_ksettings(&vp->mii, cmd); 2915 + mii_ethtool_get_link_ksettings(&vp->mii, cmd); 2916 + 2917 + return 0; 2916 2918 } 2917 2919 2918 2920 static int vortex_set_link_ksettings(struct net_device *dev,
+1 -4
drivers/net/ethernet/amd/pcnet32.c
··· 731 731 { 732 732 struct pcnet32_private *lp = netdev_priv(dev); 733 733 unsigned long flags; 734 - int r = -EOPNOTSUPP; 735 734 736 735 spin_lock_irqsave(&lp->lock, flags); 737 736 if (lp->mii) { 738 737 mii_ethtool_get_link_ksettings(&lp->mii_if, cmd); 739 - r = 0; 740 738 } else if (lp->chip_version == PCNET32_79C970A) { 741 739 if (lp->autoneg) { 742 740 cmd->base.autoneg = AUTONEG_ENABLE; ··· 751 753 ethtool_convert_legacy_u32_to_link_mode( 752 754 cmd->link_modes.supported, 753 755 SUPPORTED_TP | SUPPORTED_AUI); 754 - r = 0; 755 756 } 756 757 spin_unlock_irqrestore(&lp->lock, flags); 757 - return r; 758 + return 0; 758 759 } 759 760 760 761 static int pcnet32_set_link_ksettings(struct net_device *dev,
+4 -1
drivers/net/ethernet/cirrus/ep93xx_eth.c
··· 702 702 struct ethtool_link_ksettings *cmd) 703 703 { 704 704 struct ep93xx_priv *ep = netdev_priv(dev); 705 - return mii_ethtool_get_link_ksettings(&ep->mii, cmd); 705 + 706 + mii_ethtool_get_link_ksettings(&ep->mii, cmd); 707 + 708 + return 0; 706 709 } 707 710 708 711 static int ep93xx_set_link_ksettings(struct net_device *dev,
+2 -3
drivers/net/ethernet/dec/tulip/winbond-840.c
··· 1395 1395 struct ethtool_link_ksettings *cmd) 1396 1396 { 1397 1397 struct netdev_private *np = netdev_priv(dev); 1398 - int rc; 1399 1398 1400 1399 spin_lock_irq(&np->lock); 1401 - rc = mii_ethtool_get_link_ksettings(&np->mii_if, cmd); 1400 + mii_ethtool_get_link_ksettings(&np->mii_if, cmd); 1402 1401 spin_unlock_irq(&np->lock); 1403 1402 1404 - return rc; 1403 + return 0; 1405 1404 } 1406 1405 1407 1406 static int netdev_set_link_ksettings(struct net_device *dev,
+4 -1
drivers/net/ethernet/faraday/ftmac100.c
··· 829 829 struct ethtool_link_ksettings *cmd) 830 830 { 831 831 struct ftmac100 *priv = netdev_priv(netdev); 832 - return mii_ethtool_get_link_ksettings(&priv->mii, cmd); 832 + 833 + mii_ethtool_get_link_ksettings(&priv->mii, cmd); 834 + 835 + return 0; 833 836 } 834 837 835 838 static int ftmac100_set_link_ksettings(struct net_device *netdev,
+2 -3
drivers/net/ethernet/fealnx.c
··· 1821 1821 struct ethtool_link_ksettings *cmd) 1822 1822 { 1823 1823 struct netdev_private *np = netdev_priv(dev); 1824 - int rc; 1825 1824 1826 1825 spin_lock_irq(&np->lock); 1827 - rc = mii_ethtool_get_link_ksettings(&np->mii, cmd); 1826 + mii_ethtool_get_link_ksettings(&np->mii, cmd); 1828 1827 spin_unlock_irq(&np->lock); 1829 1828 1830 - return rc; 1829 + return 0; 1831 1830 } 1832 1831 1833 1832 static int netdev_set_link_ksettings(struct net_device *dev,
+4 -1
drivers/net/ethernet/intel/e100.c
··· 2430 2430 struct ethtool_link_ksettings *cmd) 2431 2431 { 2432 2432 struct nic *nic = netdev_priv(netdev); 2433 - return mii_ethtool_get_link_ksettings(&nic->mii, cmd); 2433 + 2434 + mii_ethtool_get_link_ksettings(&nic->mii, cmd); 2435 + 2436 + return 0; 2434 2437 } 2435 2438 2436 2439 static int e100_set_link_ksettings(struct net_device *netdev,
+2 -3
drivers/net/ethernet/jme.c
··· 2610 2610 struct ethtool_link_ksettings *cmd) 2611 2611 { 2612 2612 struct jme_adapter *jme = netdev_priv(netdev); 2613 - int rc; 2614 2613 2615 2614 spin_lock_bh(&jme->phy_lock); 2616 - rc = mii_ethtool_get_link_ksettings(&jme->mii_if, cmd); 2615 + mii_ethtool_get_link_ksettings(&jme->mii_if, cmd); 2617 2616 spin_unlock_bh(&jme->phy_lock); 2618 - return rc; 2617 + return 0; 2619 2618 } 2620 2619 2621 2620 static int
+2 -3
drivers/net/ethernet/korina.c
··· 699 699 struct ethtool_link_ksettings *cmd) 700 700 { 701 701 struct korina_private *lp = netdev_priv(dev); 702 - int rc; 703 702 704 703 spin_lock_irq(&lp->lock); 705 - rc = mii_ethtool_get_link_ksettings(&lp->mii_if, cmd); 704 + mii_ethtool_get_link_ksettings(&lp->mii_if, cmd); 706 705 spin_unlock_irq(&lp->lock); 707 706 708 - return rc; 707 + return 0; 709 708 } 710 709 711 710 static int netdev_set_link_ksettings(struct net_device *dev,
+4 -1
drivers/net/ethernet/micrel/ks8851.c
··· 1071 1071 struct ethtool_link_ksettings *cmd) 1072 1072 { 1073 1073 struct ks8851_net *ks = netdev_priv(dev); 1074 - return mii_ethtool_get_link_ksettings(&ks->mii, cmd); 1074 + 1075 + mii_ethtool_get_link_ksettings(&ks->mii, cmd); 1076 + 1077 + return 0; 1075 1078 } 1076 1079 1077 1080 static int ks8851_set_link_ksettings(struct net_device *dev,
+4 -1
drivers/net/ethernet/micrel/ks8851_mll.c
··· 1315 1315 struct ethtool_link_ksettings *cmd) 1316 1316 { 1317 1317 struct ks_net *ks = netdev_priv(netdev); 1318 - return mii_ethtool_get_link_ksettings(&ks->mii, cmd); 1318 + 1319 + mii_ethtool_get_link_ksettings(&ks->mii, cmd); 1320 + 1321 + return 0; 1319 1322 } 1320 1323 1321 1324 static int ks_set_link_ksettings(struct net_device *netdev,
+4 -1
drivers/net/ethernet/nuvoton/w90p910_ether.c
··· 868 868 struct ethtool_link_ksettings *cmd) 869 869 { 870 870 struct w90p910_ether *ether = netdev_priv(dev); 871 - return mii_ethtool_get_link_ksettings(&ether->mii, cmd); 871 + 872 + mii_ethtool_get_link_ksettings(&ether->mii, cmd); 873 + 874 + return 0; 872 875 } 873 876 874 877 static int w90p910_set_link_ksettings(struct net_device *dev,
+3 -3
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
··· 85 85 { 86 86 struct pch_gbe_adapter *adapter = netdev_priv(netdev); 87 87 u32 supported, advertising; 88 - int ret; 89 88 90 - ret = mii_ethtool_get_link_ksettings(&adapter->mii, ecmd); 89 + mii_ethtool_get_link_ksettings(&adapter->mii, ecmd); 91 90 92 91 ethtool_convert_link_mode_to_legacy_u32(&supported, 93 92 ecmd->link_modes.supported); ··· 103 104 104 105 if (!netif_carrier_ok(adapter->netdev)) 105 106 ecmd->base.speed = SPEED_UNKNOWN; 106 - return ret; 107 + 108 + return 0; 107 109 } 108 110 109 111 /**
+2 -3
drivers/net/ethernet/realtek/8139cp.c
··· 1410 1410 struct ethtool_link_ksettings *cmd) 1411 1411 { 1412 1412 struct cp_private *cp = netdev_priv(dev); 1413 - int rc; 1414 1413 unsigned long flags; 1415 1414 1416 1415 spin_lock_irqsave(&cp->lock, flags); 1417 - rc = mii_ethtool_get_link_ksettings(&cp->mii_if, cmd); 1416 + mii_ethtool_get_link_ksettings(&cp->mii_if, cmd); 1418 1417 spin_unlock_irqrestore(&cp->lock, flags); 1419 1418 1420 - return rc; 1419 + return 0; 1421 1420 } 1422 1421 1423 1422 static int cp_set_link_ksettings(struct net_device *dev,
+3 -1
drivers/net/ethernet/realtek/r8169.c
··· 2148 2148 { 2149 2149 struct rtl8169_private *tp = netdev_priv(dev); 2150 2150 2151 - return mii_ethtool_get_link_ksettings(&tp->mii, cmd); 2151 + mii_ethtool_get_link_ksettings(&tp->mii, cmd); 2152 + 2153 + return 0; 2152 2154 } 2153 2155 2154 2156 static int rtl8169_get_link_ksettings(struct net_device *dev,
+2 -3
drivers/net/ethernet/sgi/ioc3-eth.c
··· 1562 1562 struct ethtool_link_ksettings *cmd) 1563 1563 { 1564 1564 struct ioc3_private *ip = netdev_priv(dev); 1565 - int rc; 1566 1565 1567 1566 spin_lock_irq(&ip->ioc3_lock); 1568 - rc = mii_ethtool_get_link_ksettings(&ip->mii, cmd); 1567 + mii_ethtool_get_link_ksettings(&ip->mii, cmd); 1569 1568 spin_unlock_irq(&ip->ioc3_lock); 1570 1569 1571 - return rc; 1570 + return 0; 1572 1571 } 1573 1572 1574 1573 static int ioc3_set_link_ksettings(struct net_device *dev,
+3 -1
drivers/net/ethernet/sis/sis190.c
··· 1739 1739 { 1740 1740 struct sis190_private *tp = netdev_priv(dev); 1741 1741 1742 - return mii_ethtool_get_link_ksettings(&tp->mii_if, cmd); 1742 + mii_ethtool_get_link_ksettings(&tp->mii_if, cmd); 1743 + 1744 + return 0; 1743 1745 } 1744 1746 1745 1747 static int sis190_set_link_ksettings(struct net_device *dev,
+2 -3
drivers/net/ethernet/smsc/epic100.c
··· 1391 1391 struct ethtool_link_ksettings *cmd) 1392 1392 { 1393 1393 struct epic_private *np = netdev_priv(dev); 1394 - int rc; 1395 1394 1396 1395 spin_lock_irq(&np->lock); 1397 - rc = mii_ethtool_get_link_ksettings(&np->mii, cmd); 1396 + mii_ethtool_get_link_ksettings(&np->mii, cmd); 1398 1397 spin_unlock_irq(&np->lock); 1399 1398 1400 - return rc; 1399 + return 0; 1401 1400 } 1402 1401 1403 1402 static int netdev_set_link_ksettings(struct net_device *dev,
+3 -4
drivers/net/ethernet/smsc/smc911x.c
··· 1450 1450 struct ethtool_link_ksettings *cmd) 1451 1451 { 1452 1452 struct smc911x_local *lp = netdev_priv(dev); 1453 - int ret, status; 1453 + int status; 1454 1454 unsigned long flags; 1455 1455 u32 supported; 1456 1456 ··· 1458 1458 1459 1459 if (lp->phy_type != 0) { 1460 1460 spin_lock_irqsave(&lp->lock, flags); 1461 - ret = mii_ethtool_get_link_ksettings(&lp->mii, cmd); 1461 + mii_ethtool_get_link_ksettings(&lp->mii, cmd); 1462 1462 spin_unlock_irqrestore(&lp->lock, flags); 1463 1463 } else { 1464 1464 supported = SUPPORTED_10baseT_Half | ··· 1480 1480 ethtool_convert_legacy_u32_to_link_mode( 1481 1481 cmd->link_modes.supported, supported); 1482 1482 1483 - ret = 0; 1484 1483 } 1485 1484 1486 - return ret; 1485 + return 0; 1487 1486 } 1488 1487 1489 1488 static int
+5 -8
drivers/net/ethernet/smsc/smc91c92_cs.c
··· 1843 1843 } 1844 1844 } 1845 1845 1846 - static int smc_netdev_get_ecmd(struct net_device *dev, 1847 - struct ethtool_link_ksettings *ecmd) 1846 + static void smc_netdev_get_ecmd(struct net_device *dev, 1847 + struct ethtool_link_ksettings *ecmd) 1848 1848 { 1849 1849 u16 tmp; 1850 1850 unsigned int ioaddr = dev->base_addr; ··· 1865 1865 1866 1866 ethtool_convert_legacy_u32_to_link_mode(ecmd->link_modes.supported, 1867 1867 supported); 1868 - 1869 - return 0; 1870 1868 } 1871 1869 1872 1870 static int smc_netdev_set_ecmd(struct net_device *dev, ··· 1916 1918 struct smc_private *smc = netdev_priv(dev); 1917 1919 unsigned int ioaddr = dev->base_addr; 1918 1920 u16 saved_bank = inw(ioaddr + BANK_SELECT); 1919 - int ret; 1920 1921 unsigned long flags; 1921 1922 1922 1923 spin_lock_irqsave(&smc->lock, flags); 1923 1924 SMC_SELECT_BANK(3); 1924 1925 if (smc->cfg & CFG_MII_SELECT) 1925 - ret = mii_ethtool_get_link_ksettings(&smc->mii_if, ecmd); 1926 + mii_ethtool_get_link_ksettings(&smc->mii_if, ecmd); 1926 1927 else 1927 - ret = smc_netdev_get_ecmd(dev, ecmd); 1928 + smc_netdev_get_ecmd(dev, ecmd); 1928 1929 SMC_SELECT_BANK(saved_bank); 1929 1930 spin_unlock_irqrestore(&smc->lock, flags); 1930 - return ret; 1931 + return 0; 1931 1932 } 1932 1933 1933 1934 static int smc_set_link_ksettings(struct net_device *dev,
+2 -5
drivers/net/ethernet/smsc/smc91x.c
··· 1539 1539 struct ethtool_link_ksettings *cmd) 1540 1540 { 1541 1541 struct smc_local *lp = netdev_priv(dev); 1542 - int ret; 1543 1542 1544 1543 if (lp->phy_type != 0) { 1545 1544 spin_lock_irq(&lp->lock); 1546 - ret = mii_ethtool_get_link_ksettings(&lp->mii, cmd); 1545 + mii_ethtool_get_link_ksettings(&lp->mii, cmd); 1547 1546 spin_unlock_irq(&lp->lock); 1548 1547 } else { 1549 1548 u32 supported = SUPPORTED_10baseT_Half | ··· 1561 1562 1562 1563 ethtool_convert_legacy_u32_to_link_mode( 1563 1564 cmd->link_modes.supported, supported); 1564 - 1565 - ret = 0; 1566 1565 } 1567 1566 1568 - return ret; 1567 + return 0; 1569 1568 } 1570 1569 1571 1570 static int
+2 -3
drivers/net/ethernet/tundra/tsi108_eth.c
··· 1504 1504 { 1505 1505 struct tsi108_prv_data *data = netdev_priv(dev); 1506 1506 unsigned long flags; 1507 - int rc; 1508 1507 1509 1508 spin_lock_irqsave(&data->txlock, flags); 1510 - rc = mii_ethtool_get_link_ksettings(&data->mii_if, cmd); 1509 + mii_ethtool_get_link_ksettings(&data->mii_if, cmd); 1511 1510 spin_unlock_irqrestore(&data->txlock, flags); 1512 1511 1513 - return rc; 1512 + return 0; 1514 1513 } 1515 1514 1516 1515 static int tsi108_set_link_ksettings(struct net_device *dev,
+2 -3
drivers/net/ethernet/via/via-rhine.c
··· 2307 2307 struct ethtool_link_ksettings *cmd) 2308 2308 { 2309 2309 struct rhine_private *rp = netdev_priv(dev); 2310 - int rc; 2311 2310 2312 2311 mutex_lock(&rp->task_lock); 2313 - rc = mii_ethtool_get_link_ksettings(&rp->mii_if, cmd); 2312 + mii_ethtool_get_link_ksettings(&rp->mii_if, cmd); 2314 2313 mutex_unlock(&rp->task_lock); 2315 2314 2316 - return rc; 2315 + return 0; 2317 2316 } 2318 2317 2319 2318 static int netdev_set_link_ksettings(struct net_device *dev,
+2 -6
drivers/net/mii.c
··· 141 141 * 142 142 * The @cmd parameter is expected to have been cleared before calling 143 143 * mii_ethtool_get_link_ksettings(). 144 - * 145 - * Returns 0 for success, negative on error. 146 144 */ 147 - int mii_ethtool_get_link_ksettings(struct mii_if_info *mii, 148 - struct ethtool_link_ksettings *cmd) 145 + void mii_ethtool_get_link_ksettings(struct mii_if_info *mii, 146 + struct ethtool_link_ksettings *cmd) 149 147 { 150 148 struct net_device *dev = mii->dev; 151 149 u16 bmcr, bmsr, ctrl1000 = 0, stat1000 = 0; ··· 225 227 lp_advertising); 226 228 227 229 /* ignore maxtxpkt, maxrxpkt for now */ 228 - 229 - return 0; 230 230 } 231 231 232 232 /**
+4 -1
drivers/net/usb/ax88179_178a.c
··· 624 624 struct ethtool_link_ksettings *cmd) 625 625 { 626 626 struct usbnet *dev = netdev_priv(net); 627 - return mii_ethtool_get_link_ksettings(&dev->mii, cmd); 627 + 628 + mii_ethtool_get_link_ksettings(&dev->mii, cmd); 629 + 630 + return 0; 628 631 } 629 632 630 633 static int ax88179_set_link_ksettings(struct net_device *net,
+1 -1
drivers/net/usb/r8152.c
··· 3835 3835 3836 3836 mutex_lock(&tp->control); 3837 3837 3838 - ret = mii_ethtool_get_link_ksettings(&tp->mii, cmd); 3838 + mii_ethtool_get_link_ksettings(&tp->mii, cmd); 3839 3839 3840 3840 mutex_unlock(&tp->control); 3841 3841
+3 -1
drivers/net/usb/usbnet.c
··· 956 956 if (!dev->mii.mdio_read) 957 957 return -EOPNOTSUPP; 958 958 959 - return mii_ethtool_get_link_ksettings(&dev->mii, cmd); 959 + mii_ethtool_get_link_ksettings(&dev->mii, cmd); 960 + 961 + return 0; 960 962 } 961 963 EXPORT_SYMBOL_GPL(usbnet_get_link_ksettings); 962 964
+1 -1
include/linux/mii.h
··· 31 31 extern int mii_link_ok (struct mii_if_info *mii); 32 32 extern int mii_nway_restart (struct mii_if_info *mii); 33 33 extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); 34 - extern int mii_ethtool_get_link_ksettings( 34 + extern void mii_ethtool_get_link_ksettings( 35 35 struct mii_if_info *mii, struct ethtool_link_ksettings *cmd); 36 36 extern int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); 37 37 extern int mii_ethtool_set_link_ksettings(