Path: csiph.com!goblin3!goblin.stu.neva.ru!news.roellig-ltd.de!open-news-network.org!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: Philippe Reynes Newsgroups: linux.kernel Subject: [PATCH 2/2] net: ethernet: dwc_eth_qos: use phy_ethtool_{get|set}_link_ksettings Date: Sat, 25 Jun 2016 23:10:01 +0200 Message-ID: References: Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vxO4DTLmA5MKZoqUta/wW1eh4j81ACcIERxdjPzWW+8=; b=oljE/+8b9BLkYeT/j+t9BoVfv1guhLbtMjeqlcQSXSVPjgbqCUVLTUlrPcA+SF9/hD IzHWzOVbsQSTG6Z7glhe9+ZqKZtZf4rxqDGPOx49YBSX+5cPYLNKGi1PSAwpLpocQVLn qw2EJx2PuxRTwbTrMZQ8mXO8HjJXAUubWSmL7/DPZmimF6gnMHEbpRcUtwC3ZPKxJSdw YE/ukq4+oSXjJSTniQJJhJHwv0UzirUV3m33L85XKdSIJPSe5wvxEcNs4DmsSjoRcUbh lxWqtckQNcNnxWm61eT9Qfth8m/VDGAsFuMHbFZuTSSsqeMt3YCPPKgTVfibx6FYItyq Uhqw== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vxO4DTLmA5MKZoqUta/wW1eh4j81ACcIERxdjPzWW+8=; b=lk4Ztv0uRQRDLIwxWMUSIahVuomHXswRaFMmbD4JrfcFUyh7M9V4QJ1vouvrYBeeDi uwC7h47mAvPkm3ie0rFVA9sXOnAODUmaKvygWpO1vQZgLJtPON+++MsLv4zcY1qtv1FC aAej3ws/dP+bYJlOWnd7ZMHFrSgzCgwzMntF4LhQEgrc8bDey4Uc7PKagpB1gjEgDys6 pYpW1yJ9vCnM0HlONT3qTuaarG5CPIgodNusEOYoZHJv4Y0hxCcZzcmlM2oFlg9xWu82 vs7pXbZJl5YhNPDIFTiG1c4zadQQkNI52u2f5uSy4mBtvbYdZZNrYzGZEJIr6kLyxlmP uRWw== X-Gm-Message-State: ALyK8tL7703J+sIPgIqg/z8eVcozYg6GfqHh/VVZiI0BDlo2+cVV1RcKqRmwuV7T9sx0yg== X-Received: by 10.28.217.146 with SMTP id q140mr4066324wmg.56.1466888732408; Sat, 25 Jun 2016 14:05:32 -0700 (PDT) X-Mailer: git-send-email 1.7.4.4 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 61 Organization: linux.* mail to news gateway X-Original-Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes X-Original-Date: Sat, 25 Jun 2016 23:05:16 +0200 X-Original-Message-ID: <1466888716-31222-2-git-send-email-tremyfr@gmail.com> X-Original-References: <1466888716-31222-1-git-send-email-tremyfr@gmail.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1431217 There are two generics functions phy_ethtool_{get|set}_link_ksettings, so we can use them instead of defining the same code in the driver. Signed-off-by: Philippe Reynes --- drivers/net/ethernet/synopsys/dwc_eth_qos.c | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/synopsys/dwc_eth_qos.c b/drivers/net/ethernet/synopsys/dwc_eth_qos.c index 094234f..c14fa91 100644 --- a/drivers/net/ethernet/synopsys/dwc_eth_qos.c +++ b/drivers/net/ethernet/synopsys/dwc_eth_qos.c @@ -2524,28 +2524,6 @@ dwceqos_get_stats64(struct net_device *ndev, struct rtnl_link_stats64 *s) return s; } -static int -dwceqos_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd) -{ - struct phy_device *phydev = ndev->phydev; - - if (!phydev) - return -ENODEV; - - return phy_ethtool_gset(phydev, ecmd); -} - -static int -dwceqos_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd) -{ - struct phy_device *phydev = ndev->phydev; - - if (!phydev) - return -ENODEV; - - return phy_ethtool_sset(phydev, ecmd); -} - static void dwceqos_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *ed) { @@ -2764,8 +2742,6 @@ static void dwceqos_set_msglevel(struct net_device *ndev, u32 msglevel) } static struct ethtool_ops dwceqos_ethtool_ops = { - .get_settings = dwceqos_get_settings, - .set_settings = dwceqos_set_settings, .get_drvinfo = dwceqos_get_drvinfo, .get_link = ethtool_op_get_link, .get_pauseparam = dwceqos_get_pauseparam, @@ -2779,6 +2755,8 @@ static struct ethtool_ops dwceqos_ethtool_ops = { .set_eee = dwceqos_set_eee, .get_msglevel = dwceqos_get_msglevel, .set_msglevel = dwceqos_set_msglevel, + .get_link_ksettings = phy_ethtool_get_link_ksettings, + .set_link_ksettings = phy_ethtool_set_link_ksettings, }; static struct net_device_ops netdev_ops = { -- 1.7.4.4