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 v2 06/10] r8169: use phy_mii_ioctl
Date: Tue, 10 Jul 2018 20:39:40 +0200	[thread overview]
Message-ID: <c901d4e7-6e6e-378c-daa6-b5e27c59d982@gmail.com> (raw)
In-Reply-To: <84ac1cb7-bafd-5f15-8cda-e8dfd7d0deb3@gmail.com>

Switch to using phy_mii_ioctl().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/net/ethernet/realtek/r8169.c | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f0aa1b54..deed477e 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4283,31 +4283,12 @@ static int rtl_set_mac_address(struct net_device *dev, void *p)
 	return 0;
 }
 
-static int rtl_xmii_ioctl(struct rtl8169_private *tp,
-			  struct mii_ioctl_data *data, int cmd)
-{
-	switch (cmd) {
-	case SIOCGMIIPHY:
-		data->phy_id = 32; /* Internal PHY */
-		return 0;
-
-	case SIOCGMIIREG:
-		data->val_out = rtl_readphy(tp, data->reg_num & 0x1f);
-		return 0;
-
-	case SIOCSMIIREG:
-		rtl_writephy(tp, data->reg_num & 0x1f, data->val_in);
-		return 0;
-	}
-	return -EOPNOTSUPP;
-}
-
 static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-	struct rtl8169_private *tp = netdev_priv(dev);
-	struct mii_ioctl_data *data = if_mii(ifr);
+	if (!netif_running(dev))
+		return -ENODEV;
 
-	return netif_running(dev) ? rtl_xmii_ioctl(tp, data, cmd) : -ENODEV;
+	return phy_mii_ioctl(dev->phydev, ifr, cmd);
 }
 
 static void rtl_init_mdio_ops(struct rtl8169_private *tp)
-- 
2.18.0

  parent reply	other threads:[~2018-07-10 18:40 UTC|newest]

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

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=c901d4e7-6e6e-378c-daa6-b5e27c59d982@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).