From patchwork Tue Mar 31 21:08:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 457022 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EC51D1401DE for ; Wed, 1 Apr 2015 08:10:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=CVBWgaPo; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754128AbbCaVKC (ORCPT ); Tue, 31 Mar 2015 17:10:02 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:34824 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753539AbbCaVIq (ORCPT ); Tue, 31 Mar 2015 17:08:46 -0400 Received: by wgdm6 with SMTP id m6so33005786wgd.2; Tue, 31 Mar 2015 14:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WzhK7Xju6+/90N3WZDjFr24QilJNujy0ZXf7YH/9730=; b=CVBWgaPoA/47J6Ns3Ov1h1Em7K2HO4SEDvM+1zKD5Z8y3Yi1frZ8wOn1qXqdHFogh0 liDJv2DEg58iFeKzikEkSScBD2BEKy43vH/z0jkwt1cBZaGQdNh8NvN2q659bQBJgLZ8 Ifew4HmS9rS3n48cTBNdx+nIb6lBxrxwSk+mqo9N0HxBwrHzu22zVjwkOTNzxXOkL2Z3 KhlNQXD0TAWFnFC1tvgggcl/g5OJyku9jtfNB9hrY6NKUIDDj/OF+AfOPldgOMlPEgY2 MkSJyWUhjZl7YYvp6BAfHsSp5kp2f2Xi08MEe6/F5Q8P2MyPgRZ/JcGq1uXaYSFK3vxt 21nA== X-Received: by 10.180.76.148 with SMTP id k20mr8900750wiw.71.1427836125187; Tue, 31 Mar 2015 14:08:45 -0700 (PDT) Received: from hoboy.home (193-81-104-48.adsl.highway.telekom.at. [193.81.104.48]) by mx.google.com with ESMTPSA id xy2sm21956712wjc.14.2015.03.31.14.08.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2015 14:08:44 -0700 (PDT) From: Richard Cochran To: Cc: , Amir Vadai , Arnd Bergmann , Baolin Wang , David Miller , Frank Li , Giuseppe Cavallaro , Jacob Keller , Jeff Kirsher , John Stultz , Luwei Zhou , Matthew Vick , Michael Chan , Prashant Sreedharan , Rayagond K , Sonic Zhang , Sony Chacko , Thomas Gleixner Subject: [PATCH net-next 10/11] ptp: stmmac: use helpers for converting ns to timespec. Date: Tue, 31 Mar 2015 23:08:15 +0200 Message-Id: <93b0d362b29bf5ba1bc9c09b2e25e6958fb32511.1427835485.git.richardcochran@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch changes the driver to use ns_to_timespec64() instead of open coding the same logic. Compile tested only. Signed-off-by: Richard Cochran --- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 172f318..170a18b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -111,7 +111,6 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts) container_of(ptp, struct stmmac_priv, ptp_clock_ops); unsigned long flags; u64 ns; - u32 reminder; spin_lock_irqsave(&priv->ptp_lock, flags); @@ -119,8 +118,7 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts) spin_unlock_irqrestore(&priv->ptp_lock, flags); - ts->tv_sec = div_u64_rem(ns, 1000000000ULL, &reminder); - ts->tv_nsec = reminder; + *ts = ns_to_timespec64(ns); return 0; }