From: Richard Cochran <richardcochran@gmail.com>
To: netdev@vger.kernel.org
Cc: David Miller <davem@davemloft.net>,
devicetree@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jacob Keller <jacob.e.keller@intel.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Mark Rutland <mark.rutland@arm.com>,
Miroslav Lichvar <mlichvar@redhat.com>,
Murali Karicheri <m-karicheri2@ti.com>,
Rob Herring <robh+dt@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Wingman Kwok <w-kwok2@ti.com>
Subject: [PATCH V9 net-next 05/12] net: netcp_ethss: Use the PHY time stamping interface.
Date: Wed, 25 Dec 2019 18:16:13 -0800 [thread overview]
Message-ID: <76cd58c2032f894184aeb2f1e23a59b368f3eb2c.1577326042.git.richardcochran@gmail.com> (raw)
In-Reply-To: <cover.1577326042.git.richardcochran@gmail.com>
The netcp_ethss driver tests fields of the phy_device in order to
determine whether to defer to the PHY's time stamping functionality.
This patch replaces the open coded logic with an invocation of the
proper methods.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/ti/netcp_ethss.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 86a3f42a3dcc..1280ccd581d4 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -2533,8 +2533,6 @@ static int gbe_del_vid(void *intf_priv, int vid)
}
#if IS_ENABLED(CONFIG_TI_CPTS)
-#define HAS_PHY_TXTSTAMP(p) ((p)->drv && (p)->drv->txtstamp)
-#define HAS_PHY_RXTSTAMP(p) ((p)->drv && (p)->drv->rxtstamp)
static void gbe_txtstamp(void *context, struct sk_buff *skb)
{
@@ -2566,7 +2564,7 @@ static int gbe_txtstamp_mark_pkt(struct gbe_intf *gbe_intf,
* We mark it here because skb_tx_timestamp() is called
* after all the txhooks are called.
*/
- if (phydev && HAS_PHY_TXTSTAMP(phydev)) {
+ if (phy_has_txtstamp(phydev)) {
skb_shinfo(p_info->skb)->tx_flags |= SKBTX_IN_PROGRESS;
return 0;
}
@@ -2588,7 +2586,7 @@ static int gbe_rxtstamp(struct gbe_intf *gbe_intf, struct netcp_packet *p_info)
if (p_info->rxtstamp_complete)
return 0;
- if (phydev && HAS_PHY_RXTSTAMP(phydev)) {
+ if (phy_has_rxtstamp(phydev)) {
p_info->rxtstamp_complete = true;
return 0;
}
@@ -2830,7 +2828,7 @@ static int gbe_ioctl(void *intf_priv, struct ifreq *req, int cmd)
struct gbe_intf *gbe_intf = intf_priv;
struct phy_device *phy = gbe_intf->slave->phy;
- if (!phy || !phy->drv->hwtstamp) {
+ if (!phy_has_hwtstamp(phy)) {
switch (cmd) {
case SIOCGHWTSTAMP:
return gbe_hwtstamp_get(gbe_intf, req);
--
2.20.1
next prev parent reply other threads:[~2019-12-26 2:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-26 2:16 [PATCH V9 net-next 00/12] Peer to Peer One-Step time stamping Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 01/12] net: phy: Introduce helper functions for time stamping support Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 02/12] net: macvlan: Use the PHY time stamping interface Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 03/12] net: vlan: " Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 04/12] net: ethtool: " Richard Cochran
2019-12-26 2:16 ` Richard Cochran [this message]
2019-12-26 2:16 ` [PATCH V9 net-next 06/12] net: phy: dp83640: Move the probe and remove methods around Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 07/12] net: Introduce a new MII time stamping interface Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 08/12] net: Add a layer for non-PHY MII time stamping drivers Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 09/12] dt-bindings: ptp: Introduce MII time stamping devices Richard Cochran
2019-12-26 22:58 ` Rob Herring
2019-12-26 2:16 ` [PATCH V9 net-next 10/12] net: mdio: of: Register discovered MII time stampers Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 11/12] net: Introduce peer to peer one step PTP time stamping Richard Cochran
2019-12-26 2:16 ` [PATCH V9 net-next 12/12] ptp: Add a driver for InES time stamping IP core Richard Cochran
2019-12-26 3:51 ` [PATCH V9 net-next 00/12] Peer to Peer One-Step time stamping David Miller
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=76cd58c2032f894184aeb2f1e23a59b368f3eb2c.1577326042.git.richardcochran@gmail.com \
--to=richardcochran@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=jacob.e.keller@intel.com \
--cc=jakub.kicinski@netronome.com \
--cc=m-karicheri2@ti.com \
--cc=mark.rutland@arm.com \
--cc=mlichvar@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=w-kwok2@ti.com \
--cc=willemb@google.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).