From patchwork Tue Mar 31 21:08:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 457023 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 0B1DE14008F for ; Wed, 1 Apr 2015 08:10:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=L2q44qBe; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754068AbbCaVIp (ORCPT ); Tue, 31 Mar 2015 17:08:45 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:38050 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753888AbbCaVIh (ORCPT ); Tue, 31 Mar 2015 17:08:37 -0400 Received: by wibgn9 with SMTP id gn9so41911329wib.1; Tue, 31 Mar 2015 14:08:35 -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=IoqpAxMRuVEquSnyZlLWO4R+URTlW4o6bMAuBBDurPY=; b=L2q44qBewZQ80f/lEH0Hl8kul6TVDdlDEawJuwKON0Vz+/Mqq57Qw1wQ36gnYCehO9 bHvd82rGUg7zkWCNen6OWFs1azwY8zyVo4496RciMwIr9PWrSPmNj+zPaQT8/x35Tb/B pyjQUyewbNDErmfGyB7KSenv3vdHRtXGyk+6arbQlIGH8kpBoei24AzeqiNTfs5+IDyl Hd4sb2tBY9wwd6vW7wcGNMM+cCHtU8ZhVHi99OXc1T40BJM5IMNLQUuNU+tHN7WfBPYA XzgHc6C6mdUZXR3D1tYNHfUbWpzvr/recthi2oxpfmDj8j+hWfI9PjHeCMSVXzYguSbr ly4A== X-Received: by 10.194.235.71 with SMTP id uk7mr78117621wjc.13.1427836115261; Tue, 31 Mar 2015 14:08:35 -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.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2015 14:08:34 -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 06/11] ptp: e1000e: use helpers for converting ns to timespec. Date: Tue, 31 Mar 2015 23:08:11 +0200 Message-Id: <051364a3a57d36200f652f4d8e1c9bfc4edf3254.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 Acked-by: Jacob Keller --- drivers/net/ethernet/intel/e1000e/ptp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c index b747a3e..d2272ad 100644 --- a/drivers/net/ethernet/intel/e1000e/ptp.c +++ b/drivers/net/ethernet/intel/e1000e/ptp.c @@ -111,15 +111,13 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, ptp_clock_info); unsigned long flags; - u32 remainder; u64 ns; spin_lock_irqsave(&adapter->systim_lock, flags); ns = timecounter_read(&adapter->tc); spin_unlock_irqrestore(&adapter->systim_lock, flags); - ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &remainder); - ts->tv_nsec = remainder; + *ts = ns_to_timespec64(ns); return 0; }