netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: David Miller <davem@davemloft.net>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>,
	Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 05/10] r8169: use phy_ethtool_nway_reset
Date: Mon, 2 Jul 2018 21:37:03 +0200	[thread overview]
Message-ID: <968b2379-9201-d4e5-502c-566dfef1a1ea@gmail.com> (raw)
In-Reply-To: <096a5326-963c-9bef-6218-29fcde004111@gmail.com>

Switch to using phy_ethtool_nway_reset().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/Kconfig | 1 -
 drivers/net/ethernet/realtek/r8169.c | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index 7fb1af1f..e1cd934c 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -100,7 +100,6 @@ config R8169
 	select FW_LOADER
 	select CRC32
 	select PHYLIB
-	select MII
 	---help---
 	  Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
 
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index d3a909fb..6006676b 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1991,13 +1991,6 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
 	}
 }
 
-static int rtl8169_nway_reset(struct net_device *dev)
-{
-	struct rtl8169_private *tp = netdev_priv(dev);
-
-	return mii_nway_restart(&tp->mii);
-}
-
 /*
  * Interrupt coalescing
  *
@@ -2228,7 +2221,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
 	.get_sset_count		= rtl8169_get_sset_count,
 	.get_ethtool_stats	= rtl8169_get_ethtool_stats,
 	.get_ts_info		= ethtool_op_get_ts_info,
-	.nway_reset		= rtl8169_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.18.0

  parent reply	other threads:[~2018-07-02 19:37 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-02 19:29 [PATCH net-next 00/10] r8169: add phylib support Heiner Kallweit
2018-07-02 19:36 ` [PATCH net-next 01/10] r8169: add basic " Heiner Kallweit
2018-07-02 21:02   ` Andrew Lunn
2018-07-02 21:15     ` Heiner Kallweit
2018-07-03 16:42       ` Florian Fainelli
2018-07-03 19:48         ` Heiner Kallweit
2018-07-02 19:36 ` [PATCH net-next 02/10] r8169: use phy_resume/phy_suspend Heiner Kallweit
2018-07-02 21:06   ` Andrew Lunn
2018-07-02 21:24     ` Heiner Kallweit
2018-07-03 16:44       ` Florian Fainelli
2018-07-03 19:54         ` Heiner Kallweit
2018-07-02 19:36 ` [PATCH net-next 03/10] r8169: replace open-coded PHY soft reset with genphy_soft_reset Heiner Kallweit
2018-07-02 21:08   ` Andrew Lunn
2018-07-02 19:37 ` [PATCH net-next 04/10] r8169: use phy_ethtool_(g|s)et_link_ksettings Heiner Kallweit
2018-07-02 19:37 ` Heiner Kallweit [this message]
2018-07-02 21:11   ` [PATCH net-next 05/10] r8169: use phy_ethtool_nway_reset Andrew Lunn
2018-07-02 19:37 ` [PATCH net-next 06/10] r8169: use phy_mii_ioctl Heiner Kallweit
2018-07-02 21:13   ` Andrew Lunn
2018-07-02 19:37 ` [PATCH net-next 07/10] r8169: migrate speed_down function to phylib Heiner Kallweit
2018-07-02 21:20   ` Andrew Lunn
2018-07-02 21:31     ` Heiner Kallweit
2018-07-03 16:48       ` Florian Fainelli
2018-07-09 21:04         ` Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 08/10] r8169: remove rtl8169_set_speed_xmii Heiner Kallweit
2018-07-02 21:21   ` Andrew Lunn
2018-07-02 21:54     ` Heiner Kallweit
2018-07-04 14:46       ` Andrew Lunn
2018-07-04 18:13         ` Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 09/10] r8169: remove mii_if_info member from struct rtl8169_private Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 10/10] r8169: don't read chip phy status register Heiner Kallweit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=968b2379-9201-d4e5-502c-566dfef1a1ea@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=nic_swsd@realtek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).