From patchwork Mon Jan 2 18:53:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 710241 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 3tsmT16yc0z9sf9 for ; Tue, 3 Jan 2017 05:54:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OBuYorol"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933910AbdABSxz (ORCPT ); Mon, 2 Jan 2017 13:53:55 -0500 Received: from mail-wj0-f194.google.com ([209.85.210.194]:36669 "EHLO mail-wj0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933040AbdABSxU (ORCPT ); Mon, 2 Jan 2017 13:53:20 -0500 Received: by mail-wj0-f194.google.com with SMTP id j10so69536734wjb.3; Mon, 02 Jan 2017 10:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=MCxET6zkAFQRETVzYf4uQG8Q9Ed+E7g9DL6qpulZNkU=; b=OBuYorolBMPOd3dhDWVzbL7fMf3lcCU4SXxR24nDAvBUzapdlAjV3IGVru4U7T/k42 2jWxE1CzAo57+8TIrFwF4PLtbAAOwVcHt383bZweP0QGTaU0WE/bgBIRk+GrgjCUw0Vl TxAJ3Lu4sN1kflsgztmQyPx9B1Ew1jzeDaan48fSaT0BSTejbrApiVyyGh0oPkko0UIv j2ZI0Ib/10NkXrVKZ/O3vfVKiEEKZ4JTYO2rbjqWCYYrML6XmAg7nwyIkJEjET5uJ3s8 1Zl4l9cOnk84Q1owLd1PkmNGi4VEG6mWSwkcF2VEqqalIAydxexnTcg3cbVKcpY96KE0 t9EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MCxET6zkAFQRETVzYf4uQG8Q9Ed+E7g9DL6qpulZNkU=; b=Gx7DVLlZeQmnRsLn/8arNnTmVDBA13T4AZK0xlVLauNAom0I1Sbyi5tlE0Qujhk3wF ThrzcNsEOA/r/42se5sMs67ZoQAegfKfvq32m7AbPxIHMKMHVh8eI86TOEnqYEY3jT0V RNFcJqNvq+kxsodPb+mjPtVcB0sL8LgPAO+ySnoB4HSVqRjNePuZCKBJ4T7N3zg1317v CHaI56eNYCXaDGjMAjjwVamSslGyn7iS7vMGAqcmvWDQutTSr0bppNWAqemSGc46bGsJ WO1aH73k0/OsdKAokRApbhMTU5I2+Bygz5FOgUkGck+aM7pDPBxA65jmuTMDC+rIQjKW br5w== X-Gm-Message-State: AIkVDXLTPmPuT6vCyKuwRBYtfq2LU3zzCIXQQ+XfqpyY+IhzjtWNnTbGIJvugi4SS3EGdQ== X-Received: by 10.194.236.135 with SMTP id uu7mr51063248wjc.195.1483383199336; Mon, 02 Jan 2017 10:53:19 -0800 (PST) Received: from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net. [88.161.33.221]) by smtp.gmail.com with ESMTPSA id jm6sm89085241wjb.27.2017.01.02.10.53.16 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Jan 2017 10:53:18 -0800 (PST) From: Philippe Reynes To: davem@davemloft.net, joel@jms.id.au, gwshan@linux.vnet.ibm.com, andrew@lunn.ch, andrew@aj.id.au Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH] net: faraday: ftmac100: use new api ethtool_{get|set}_link_ksettings Date: Mon, 2 Jan 2017 19:53:11 +0100 Message-Id: <1483383191-30477-1-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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/faraday/ftmac100.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c index dce5f7b..c0ddbbe 100644 --- a/drivers/net/ethernet/faraday/ftmac100.c +++ b/drivers/net/ethernet/faraday/ftmac100.c @@ -825,16 +825,18 @@ static void ftmac100_get_drvinfo(struct net_device *netdev, strlcpy(info->bus_info, dev_name(&netdev->dev), sizeof(info->bus_info)); } -static int ftmac100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) +static int ftmac100_get_link_ksettings(struct net_device *netdev, + struct ethtool_link_ksettings *cmd) { struct ftmac100 *priv = netdev_priv(netdev); - return mii_ethtool_gset(&priv->mii, cmd); + return mii_ethtool_get_link_ksettings(&priv->mii, cmd); } -static int ftmac100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd) +static int ftmac100_set_link_ksettings(struct net_device *netdev, + const struct ethtool_link_ksettings *cmd) { struct ftmac100 *priv = netdev_priv(netdev); - return mii_ethtool_sset(&priv->mii, cmd); + return mii_ethtool_set_link_ksettings(&priv->mii, cmd); } static int ftmac100_nway_reset(struct net_device *netdev) @@ -850,11 +852,11 @@ static u32 ftmac100_get_link(struct net_device *netdev) } static const struct ethtool_ops ftmac100_ethtool_ops = { - .set_settings = ftmac100_set_settings, - .get_settings = ftmac100_get_settings, .get_drvinfo = ftmac100_get_drvinfo, .nway_reset = ftmac100_nway_reset, .get_link = ftmac100_get_link, + .get_link_ksettings = ftmac100_get_link_ksettings, + .set_link_ksettings = ftmac100_set_link_ksettings, }; /******************************************************************************