From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F18AAC2D0D2 for ; Fri, 20 Dec 2019 18:15:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC52B2146E for ; Fri, 20 Dec 2019 18:15:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NxxlgPf2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727690AbfLTSPf (ORCPT ); Fri, 20 Dec 2019 13:15:35 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44973 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727681AbfLTSPd (ORCPT ); Fri, 20 Dec 2019 13:15:33 -0500 Received: by mail-pg1-f194.google.com with SMTP id x7so5311907pgl.11; Fri, 20 Dec 2019 10:15:32 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=HBtEN8uxRFo6GiqOvwtE5p5fqWGQ2KXhufiiWi2owA4=; b=NxxlgPf23SAYgx+uuYsd+35mP0zC8DTYBO1k+RUJWfTd3cfMGf/FeUilgzXrfSfuoU yr6+ZtA4srCYIocMdzJlmO4rgM8MBaonODMT8KRHNii/Zj1aqvE3H6VUsyka5uMP7vqr 42I6Q7hDI/bSWhPxKJ5kE4iEArF6pHOfiL4Ltke2lOC/2me7tk1SiCPR1wUFon1Yr8SB Aat2CS2pGd91JMYZIPEmGZKFMyLYT4xLrxsfaPAyCGyZkzrwaPW86sWWYUmzQ4ugGP3C RxLbQTafMTJ4OOq9ynnPBi+8slXamZifUFIE9ZwYP1C3jzAD5DFWGkoHMKXKYA8NJpQ0 IrUA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=HBtEN8uxRFo6GiqOvwtE5p5fqWGQ2KXhufiiWi2owA4=; b=LpCl23ILa4BiCyk1rWxnyy/YbD2uAPDNoluZwknZdrghg0Jhjxb4Km2cn9Pww9wRfr rvGe2l7sEy1P8ia58sDSRxGB6PRvW1S2/8KAnupjX117vrDDQOLfeQda9it1rlnMzWS8 Yo/f+T5fqxJcz8azrd5CYclRt1PwYlt6rIvlx81Bny7BQbcpAfRG6wMM2jZwcB1TLiYG 7iHQQaePO9Zo5AQlFc88FCfdpg8xlt1hvKX+0nZMvvr5/oIHTf00QXPDOE1izakwm7wS /ShJatnHTky+SooNl8BHgjzY0ZoLUl4eaoRHP2///NxCuWuoWSwk6Vg9gO431hDeTbO8 b1uA== X-Gm-Message-State: APjAAAWCZ5PVQGRX9iivGDH2VmPDUGTtZzgShI6+kX+P2mZohUHV/vRr L49G5HgYMANBspjx/sI7D1GYPVlj X-Google-Smtp-Source: APXvYqyxQMCQUf9jae0A7rYum6mA2coMQkbF8j++Rw93PXipv6niopccBeQyf8iV9dH2rgHDMltCxg== X-Received: by 2002:a65:5608:: with SMTP id l8mr16635881pgs.210.1576865732099; Fri, 20 Dec 2019 10:15:32 -0800 (PST) Received: from localhost.localdomain (c-73-241-114-122.hsd1.ca.comcast.net. [73.241.114.122]) by smtp.gmail.com with ESMTPSA id j28sm11833869pgb.36.2019.12.20.10.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 10:15:31 -0800 (PST) From: Richard Cochran To: netdev@vger.kernel.org Cc: David Miller , devicetree@vger.kernel.org, Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jacob Keller , Jakub Kicinski , Mark Rutland , Miroslav Lichvar , Murali Karicheri , Rob Herring , Willem de Bruijn , Wingman Kwok Subject: [PATCH V7 net-next 05/11] net: netcp_ethss: Use the PHY time stamping interface. Date: Fri, 20 Dec 2019 10:15:14 -0800 Message-Id: <2ccbb4b81949214c34053da6b1462947f33ec450.1576865315.git.richardcochran@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Reviewed-by: Andrew Lunn --- 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