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

Commit 04462f2a authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: ethernet: renesas: ravb: use new api ethtool_{get|set}_link_ksettings 



The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f635171

drivers/net/ethernet/renesas/ravb_main.c

+9 −7
Original line number Original line Diff line number Diff line
@@ -1049,7 +1049,8 @@ static int ravb_phy_start(struct net_device *ndev) 
	return 0;

	return 0;

}

}





static int ravb_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)

static int ravb_get_link_ksettings(struct net_device *ndev,

				   struct ethtool_link_ksettings *cmd)

{

{

	struct ravb_private *priv = netdev_priv(ndev);

	struct ravb_private *priv = netdev_priv(ndev);

	int error = -ENODEV;

	int error = -ENODEV;
@@ -1057,14 +1058,15 @@ static int ravb_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd) 




	if (ndev->phydev) {

	if (ndev->phydev) {

		spin_lock_irqsave(&priv->lock, flags);

		spin_lock_irqsave(&priv->lock, flags);

		error = phy_ethtool_gset(ndev->phydev, ecmd);

		error = phy_ethtool_ksettings_get(ndev->phydev, cmd);

		spin_unlock_irqrestore(&priv->lock, flags);

		spin_unlock_irqrestore(&priv->lock, flags);

	}

	}





	return error;

	return error;

}

}





static int ravb_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)

static int ravb_set_link_ksettings(struct net_device *ndev,

				   const struct ethtool_link_ksettings *cmd)

{

{

	struct ravb_private *priv = netdev_priv(ndev);

	struct ravb_private *priv = netdev_priv(ndev);

	unsigned long flags;

	unsigned long flags;
@@ -1078,11 +1080,11 @@ static int ravb_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd) 
	/* Disable TX and RX */

	/* Disable TX and RX */

	ravb_rcv_snd_disable(ndev);

	ravb_rcv_snd_disable(ndev);





	error = phy_ethtool_sset(ndev->phydev, ecmd);

	error = phy_ethtool_ksettings_set(ndev->phydev, cmd);

	if (error)

	if (error)

		goto error_exit;

		goto error_exit;





	if (ecmd->duplex == DUPLEX_FULL)

	if (cmd->base.duplex == DUPLEX_FULL)

		priv->duplex = 1;

		priv->duplex = 1;

	else

	else

		priv->duplex = 0;

		priv->duplex = 0;
@@ -1306,8 +1308,6 @@ static int ravb_get_ts_info(struct net_device *ndev, 
}

}





static const struct ethtool_ops ravb_ethtool_ops = {

static const struct ethtool_ops ravb_ethtool_ops = {

	.get_settings		= ravb_get_settings,

	.set_settings		= ravb_set_settings,

	.nway_reset		= ravb_nway_reset,

	.nway_reset		= ravb_nway_reset,

	.get_msglevel		= ravb_get_msglevel,

	.get_msglevel		= ravb_get_msglevel,

	.set_msglevel		= ravb_set_msglevel,

	.set_msglevel		= ravb_set_msglevel,
@@ -1318,6 +1318,8 @@ static const struct ethtool_ops ravb_ethtool_ops = { 
	.get_ringparam		= ravb_get_ringparam,

	.get_ringparam		= ravb_get_ringparam,

	.set_ringparam		= ravb_set_ringparam,

	.set_ringparam		= ravb_set_ringparam,

	.get_ts_info		= ravb_get_ts_info,

	.get_ts_info		= ravb_get_ts_info,

	.get_link_ksettings	= ravb_get_link_ksettings,

	.set_link_ksettings	= ravb_set_link_ksettings,

};

};





static inline int ravb_hook_irq(unsigned int irq, irq_handler_t handler,

static inline int ravb_hook_irq(unsigned int irq, irq_handler_t handler,