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=unavailable 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 D721AC2D0C8 for ; Thu, 26 Dec 2019 02:16:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADA7E2072A for ; Thu, 26 Dec 2019 02:16:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W37FvhJe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727005AbfLZCQ3 (ORCPT ); Wed, 25 Dec 2019 21:16:29 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:55982 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726960AbfLZCQ2 (ORCPT ); Wed, 25 Dec 2019 21:16:28 -0500 Received: by mail-pj1-f67.google.com with SMTP id d5so2739953pjz.5; Wed, 25 Dec 2019 18:16:28 -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=qdiVljbiL8yD+9AexClzPzh6XW5pK8fMUd89Hf0ztvQ=; b=W37FvhJeyxb84SQJ+1Y0H9SGyBC2kt9YIffHiklgwF6o/B8ZR2unePWVrA1WTl7swa DzirMLrs79HbgkM20zewmV82tMF2RCfY9WjyKoNnQ1UjLlPHca0opK/Y9fp7gKY8UofV oJSxoVg0Fi2zep3R8/D7Q1q2OosIH1VwQTTSRMDlf8po6nNKqjFBcjLvg/3SAXcr0SlT VoshZkYFEyhzYR9rZtGwHYj1p7+9tMwijMs7goGSzpaUdnQZCwqMMhRw0XI3OEGS3PWG mab8CjTzga1tU9FLvpvqmn+LoN6I07Y9Uu/XwZ+9obLhPRZjdFbjlvGHIp8tCHEuvZF/ 8d/A== 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=qdiVljbiL8yD+9AexClzPzh6XW5pK8fMUd89Hf0ztvQ=; b=fmYtfSO977jtazFN63A1r1SrDRppb30FhiAL3gILOY5Ye6s3i5uPxsDAgJeNZQSjtJ bu1HnJ8sXRgvv8Tlwc7GZ4ICAznCWqhE7ioS7Jb/HrM186M02jMBIe9XShzLjeL6uv57 CqT/Fw1m4OUtXCxk1EqzA4Qqgh1WkxPF5pwZjHHV9kPEhbB+CRcN/S609HpSp3mysHUv ot5WG2s8fh9DOzbl1Ia1RFBak9zVDaGJgBUxak+0/taJPJa36QJHe0qEU/4zH8/DDwrY BJY4PrBR9ktlKKO0VXcC4Gk94kmL81vY5kd5EiwtQyLi00CcneqbUdXIazt+Cv1wssgf ZEdQ== X-Gm-Message-State: APjAAAUJeQ1C2HvXzsHbn7gk6dw37QibbkzcH1yHyVoWBO7AXcufpyrB GTzfyvo7ElARjmN/eMv0Jf4FcoV2 X-Google-Smtp-Source: APXvYqxFbpIdfeGwM/ZEawUgCkXBaJ1k1y08pfEFoxWVfnNQ+5YifkEKM6/xesujqBhCyQbEgiftyQ== X-Received: by 2002:a17:90a:c301:: with SMTP id g1mr16195114pjt.67.1577326588015; Wed, 25 Dec 2019 18:16:28 -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 b65sm31880723pgc.18.2019.12.25.18.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Dec 2019 18:16:27 -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 V9 net-next 04/12] net: ethtool: Use the PHY time stamping interface. Date: Wed, 25 Dec 2019 18:16:12 -0800 Message-Id: <6dbc095ff1744a2ddeecf98912faddab828affd4.1577326042.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 ethtool layer tests fields of the phy_device in order to determine whether to invoke the PHY's tsinfo ethtool callback. This patch replaces the open coded logic with an invocation of the proper methods. Signed-off-by: Richard Cochran Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- net/ethtool/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index aed2c2cf1623..88f7cddf5a6f 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -2096,8 +2096,8 @@ static int ethtool_get_ts_info(struct net_device *dev, void __user *useraddr) memset(&info, 0, sizeof(info)); info.cmd = ETHTOOL_GET_TS_INFO; - if (phydev && phydev->drv && phydev->drv->ts_info) { - err = phydev->drv->ts_info(phydev, &info); + if (phy_has_tsinfo(phydev)) { + err = phy_ts_info(phydev, &info); } else if (ops->get_ts_info) { err = ops->get_ts_info(dev, &info); } else { -- 2.20.1