From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH RFC 11/18] r8168: switch to phy_ethtool_nway_reset Date: Thu, 21 Dec 2017 21:50:34 +0100 Message-ID: <4af35668-a944-a1d1-3b3e-6b8a36ff561b@gmail.com> References: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: David Miller , "netdev@vger.kernel.org" To: Andrew Lunn , Realtek linux nic maintainers , Chun-Hao Lin Return-path: Received: from mail-wm0-f68.google.com ([74.125.82.68]:43746 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755760AbdLUUvT (ORCPT ); Thu, 21 Dec 2017 15:51:19 -0500 Received: by mail-wm0-f68.google.com with SMTP id n138so18364151wmg.2 for ; Thu, 21 Dec 2017 12:51:18 -0800 (PST) In-Reply-To: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Switch to phy_ethtool_nway_reset. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/Kconfig | 1 - drivers/net/ethernet/realtek/r8168.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig index 97b24103e..a31aa84be 100644 --- a/drivers/net/ethernet/realtek/Kconfig +++ b/drivers/net/ethernet/realtek/Kconfig @@ -100,7 +100,6 @@ config R8168 select FW_LOADER select CRC32 select PHYLIB - select MII ---help--- Say Y here if you have a Realtek 8168 PCI Gigabit Ethernet adapter. This driver supports the PCIE models. diff --git a/drivers/net/ethernet/realtek/r8168.c b/drivers/net/ethernet/realtek/r8168.c index e698f13c2..33f61e100 100644 --- a/drivers/net/ethernet/realtek/r8168.c +++ b/drivers/net/ethernet/realtek/r8168.c @@ -2194,13 +2194,6 @@ static void rtl8168_get_strings(struct net_device *dev, u32 stringset, u8 *data) } } -static int rtl8168_nway_reset(struct net_device *dev) -{ - struct rtl8168_private *tp = netdev_priv(dev); - - return mii_nway_restart(&tp->mii); -} - /* * Interrupt coalescing * @@ -2433,7 +2426,7 @@ static const struct ethtool_ops rtl8168_ethtool_ops = { .get_sset_count = rtl8168_get_sset_count, .get_ethtool_stats = rtl8168_get_ethtool_stats, .get_ts_info = ethtool_op_get_ts_info, - .nway_reset = rtl8168_nway_reset, + .nway_reset = phy_ethtool_nway_reset, .get_link_ksettings = phy_ethtool_get_link_ksettings, .set_link_ksettings = phy_ethtool_set_link_ksettings, }; -- 2.15.1