Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1491488

Re: [PATCH v2 net-next 3/3] net: bcmgenet: use new api ethtool_{get|set}_link_ksettings

Show all headers | View raw

On 09/25/2016 09:29 AM, Philippe Reynes wrote:
> The ethtool api {get|set}_settings is deprecated.
> We move this driver to new api {get|set}_link_ksettings.
> 
> Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
> ---
>  drivers/net/ethernet/broadcom/genet/bcmgenet.c |   24 ++++++++++--------------
>  1 files changed, 10 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 47d0a2b..2c5d9d3 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -450,32 +450,28 @@ static inline void bcmgenet_rdma_ring_writel(struct bcmgenet_priv *priv,
>  			genet_dma_ring_regs[r]);
>  }
>  
> -static int bcmgenet_get_settings(struct net_device *dev,
> -				 struct ethtool_cmd *cmd)
> +static int bcmgenet_get_link_ksettings(struct net_device *dev,
> +				       struct ethtool_link_ksettings *cmd)
>  {
> -	struct bcmgenet_priv *priv = netdev_priv(dev);
> -
>  	if (!netif_running(dev))
>  		return -EINVAL;
>  
> -	if (!priv->phydev)
> +	if (!dev->phydev)
>  		return -ENODEV;
>  
> -	return phy_ethtool_gset(priv->phydev, cmd);
> +	return phy_ethtool_ksettings_get(dev->phydev, cmd);

Can't we just use priv->phydev now instead of dev->phydev? This should
really be identical in terms of phydev lifecycle, but it just feels more
consistent to use it.
-- 
Florian

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 net-next 0/3] net: bcmgenet: only use new api ethtool_{get|set}_link_ksettings Philippe Reynes <tremyfr@gmail.com> - 2016-09-25 18:30 +0200
  [PATCH v2 net-next 3/3] net: bcmgenet: use new api ethtool_{get|set}_link_ksettings Philippe Reynes <tremyfr@gmail.com> - 2016-09-25 18:30 +0200
    Re: [PATCH v2 net-next 3/3] net: bcmgenet: use new api  ethtool_{get|set}_link_ksettings Florian Fainelli <f.fainelli@gmail.com> - 2016-09-26 20:10 +0200
  [PATCH v2 net-next 1/3] Revert "net: ethernet: bcmgenet: use new api ethtool_{get|set}_link_ksettings" Philippe Reynes <tremyfr@gmail.com> - 2016-09-25 18:40 +0200
  [PATCH v2 net-next 2/3] Revert "net: ethernet: bcmgenet: use phydev from struct net_device" Philippe Reynes <tremyfr@gmail.com> - 2016-09-25 18:40 +0200

csiph-web