From patchwork Thu Jul 14 13:20:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 648364 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rqxDW2Q50z9s9N for ; Thu, 14 Jul 2016 23:21:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ks8CIFhn; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751251AbcGNNVG (ORCPT ); Thu, 14 Jul 2016 09:21:06 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34938 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751054AbcGNNVD (ORCPT ); Thu, 14 Jul 2016 09:21:03 -0400 Received: by mail-wm0-f68.google.com with SMTP id i5so9227543wmg.2; Thu, 14 Jul 2016 06:21:02 -0700 (PDT) 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=PRQaMaq2sQUYw6yE3qo90TiIkVMhgzSXn+3kyt8tNa0=; b=ks8CIFhnaFqvsuiv24WxOPFbddWojWyFvQpBtaOj6M0wC+ZJEav8B3LpQV6f11QptJ ocNRXJ/DXUc3j5GTEx3yn6RxcXqICyOTAoPOY/3yiILboIKEXi+mtv8FuCOmUj1/LGdQ usJO6Xgq4yaknLZFewtl0nRBk0bqIpwH+6cwGxPiBzEv/CUeYeX1RABTPblYBnahoGyO DP1tALQYl4upHGZrCF5feWkRIDnA+ovCUEn/Gey/Zvm4gPZAHX+5H2jdLcqKnsi+K+Gf 1JGoHDOBHPmAyHHObn5k5jpcACGEjxiHsrLFHmSEd6RAp7W85mwfM1XuhkLqODyDSuRQ Z58A== 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=PRQaMaq2sQUYw6yE3qo90TiIkVMhgzSXn+3kyt8tNa0=; b=EgJpKBk9u2RmM7yDVz+nZq1BZNbcTHHYDaGulfjpaPOUh+e3CIjBW+cwo7/2aw13js 5Pdfs+6l6ZJaa4IfIEeFSqrVYr57I55xGaVvWyVVOCecWED5t7bzUaRmoj6zBeRERYnk cr/vqRLU/8QJT1xw5VMB5mzbbueyGRdVlf/XEIpApFxVzql09dXQwOIk5fIcebn1bXVu BbOzCmCHg5oR4lp7rHMoOnAZvvH6dC/EuOGjlWzQpdBIaOWtFjwqf59Nd8msUPbz+BQ9 aCwpikeIybVefKyUHNjP61UGsPQoaqpSj9P6/sLf3D9zCC5OJ+enkdNFceBKZQ8pCsyt gk/w== X-Gm-Message-State: ALyK8tJEk0uvjNUNIb6SO8ZYCJx+KYkC1HN5he9ISN4/X7fI0/GYf1cfqnr9RoJvUYcrQg== X-Received: by 10.28.113.135 with SMTP id d7mr15218222wmi.43.1468502462025; Thu, 14 Jul 2016 06:21:02 -0700 (PDT) Received: from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net. [88.161.33.221]) by smtp.gmail.com with ESMTPSA id g67sm3577119wme.5.2016.07.14.06.21.00 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jul 2016 06:21:01 -0700 (PDT) From: Philippe Reynes To: davem@davemloft.net, andrew@lunn.ch, linux@roeck-us.net, colin.king@canonical.com, f.fainelli@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH 2/2] net: ethernet: tc35815: use phy_ethtool_{get|set}_link_ksettings Date: Thu, 14 Jul 2016 15:20:47 +0200 Message-Id: <1468502447-2254-2-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1468502447-2254-1-git-send-email-tremyfr@gmail.com> References: <1468502447-2254-1-git-send-email-tremyfr@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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/toshiba/tc35815.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index cdf8d58..5b01b3f 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c @@ -1944,20 +1944,6 @@ static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo * strlcpy(info->bus_info, pci_name(lp->pci_dev), sizeof(info->bus_info)); } -static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) -{ - if (!dev->phydev) - return -ENODEV; - return phy_ethtool_gset(dev->phydev, cmd); -} - -static int tc35815_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) -{ - if (!dev->phydev) - return -ENODEV; - return phy_ethtool_sset(dev->phydev, cmd); -} - static u32 tc35815_get_msglevel(struct net_device *dev) { struct tc35815_local *lp = netdev_priv(dev); @@ -2007,14 +1993,14 @@ static void tc35815_get_strings(struct net_device *dev, u32 stringset, u8 *data) static const struct ethtool_ops tc35815_ethtool_ops = { .get_drvinfo = tc35815_get_drvinfo, - .get_settings = tc35815_get_settings, - .set_settings = tc35815_set_settings, .get_link = ethtool_op_get_link, .get_msglevel = tc35815_get_msglevel, .set_msglevel = tc35815_set_msglevel, .get_strings = tc35815_get_strings, .get_sset_count = tc35815_get_sset_count, .get_ethtool_stats = tc35815_get_ethtool_stats, + .get_link_ksettings = phy_ethtool_get_link_ksettings, + .set_link_ksettings = phy_ethtool_set_link_ksettings, }; static int tc35815_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)