Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82c01a84 authored by yuval.shaia@oracle.com's avatar yuval.shaia@oracle.com Committed by David S. Miller
Browse files

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: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7c6b871

drivers/net/cris/eth_v10.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/3com/3c59x.c

+3 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/amd/pcnet32.c

+1 −4
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/cirrus/ep93xx_eth.c

+4 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/dec/tulip/winbond-840.c

+2 −3
Original line number Diff line number Diff line
@@ -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,