From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423532AbcIZSHq (ORCPT ); Mon, 26 Sep 2016 14:07:46 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36073 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1034290AbcIZSHo (ORCPT ); Mon, 26 Sep 2016 14:07:44 -0400 Subject: Re: [PATCH v2 net-next 3/3] net: bcmgenet: use new api ethtool_{get|set}_link_ksettings To: Philippe Reynes , jaedon.shin@gmail.com, davem@davemloft.net References: <1474820967-1130-1-git-send-email-tremyfr@gmail.com> <1474820967-1130-4-git-send-email-tremyfr@gmail.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org From: Florian Fainelli Message-ID: Date: Mon, 26 Sep 2016 11:07:40 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1474820967-1130-4-git-send-email-tremyfr@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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