From patchwork Tue Mar 31 21:08:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 457020 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 9131B14008F for ; Wed, 1 Apr 2015 08:09:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=nt01X4u/; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753497AbbCaVJc (ORCPT ); Tue, 31 Mar 2015 17:09:32 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:34044 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754083AbbCaVIs (ORCPT ); Tue, 31 Mar 2015 17:08:48 -0400 Received: by wixo5 with SMTP id o5so16596632wix.1; Tue, 31 Mar 2015 14:08:47 -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=JNGG0i+if3Bfh7FIlJoEBTd+k0b3hkumssjAqZWH/Pw=; b=nt01X4u/s8YO93msKDryKN1ec7RzuUabKEgMTf+eeOyp8+s330YHvhIwIKZzRq+V/7 hWYDZTIEqGCUd7vJeXUBZzZMHYTBxm/mbb0k04/EJOQ4q4BKvxeZ/b1vlPOWfe12Nka1 Ld+KcNWSM1Nm56IxyAyZFpDfvIC9OvwvjxZ/QFPrsocrjzKgc9JJJGBNLSrdSMYUMBcU gjwVu1biKT8ZnVbXYbE3t/XKYvzy0dbUxVQH2uXesUs9qfoSwdK+uzyx8e/DRpIeXUAT ojZ/NP92sZ5lXPbXRTpfcVh0hklj3eBOHPltPErajMaBOUoU+LfnUWE5Qp8NQajBoGIP HhYw== X-Received: by 10.180.218.162 with SMTP id ph2mr8754342wic.22.1427836127574; Tue, 31 Mar 2015 14:08:47 -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.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2015 14:08:46 -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 11/11] ptp: cpts: use helpers for converting ns to timespec. Date: Tue, 31 Mar 2015 23:08:16 +0200 Message-Id: <82b54b3681d6fe6d3c3c5d700a6e2daafa279da3.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() and timespec64_to_ns() instead of open coding the same logic. Compile tested only. Signed-off-by: Richard Cochran --- drivers/net/ethernet/ti/cpts.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 074b636..85a55b4 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -170,7 +170,6 @@ static int cpts_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) static int cpts_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) { u64 ns; - u32 remainder; unsigned long flags; struct cpts *cpts = container_of(ptp, struct cpts, info); @@ -178,8 +177,7 @@ static int cpts_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) ns = timecounter_read(&cpts->tc); spin_unlock_irqrestore(&cpts->lock, flags); - ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder); - ts->tv_nsec = remainder; + *ts = ns_to_timespec64(ns); return 0; } @@ -191,8 +189,7 @@ static int cpts_ptp_settime(struct ptp_clock_info *ptp, unsigned long flags; struct cpts *cpts = container_of(ptp, struct cpts, info); - ns = ts->tv_sec * 1000000000ULL; - ns += ts->tv_nsec; + ns = timespec64_to_ns(ts); spin_lock_irqsave(&cpts->lock, flags); timecounter_init(&cpts->tc, &cpts->cc, ns);