From patchwork Thu Mar 19 05:45:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 451752 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 3CD2A14015A for ; Thu, 19 Mar 2015 16:47:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752997AbbCSFqo (ORCPT ); Thu, 19 Mar 2015 01:46:44 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:36449 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbbCSFqk (ORCPT ); Thu, 19 Mar 2015 01:46:40 -0400 Received: by pdbcz9 with SMTP id cz9so65608329pdb.3 for ; Wed, 18 Mar 2015 22:46:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cktGFyrvZ3FuGFKZzIs7590y6pB63SIq8lZ6oN0WquM=; b=JE0vN7Z+SJh1IlA0CSFjMv78lyv6MxBykN/+rfYKWbY+JYqKG0Bqnu91PzmVV95J9S JWR/lN1tyzNmlTPExfEb8UaMLdYbwxx60GISrbi04uMhUlmW2ugmbMaGXvjiQWQaR/5W /4GYrgX6qb7wOKpcBGf6iHhd56juX+6dVNjR1LNTkDC9eE+GoYcMXs9Cw32ymkBfo9Vp AfIFeptp9IvVNes9epu2chCHbW+C6wBOKj9EjL6+16Tha6YbmZ4fDJOGtLw8fNCTv/Dq HyospmBQdWfRij4eGzCU8uUzgJdW8EVKFCLeTRruBRBsoqe+UfCp/+ufk0dv0x+xKo8b X4VA== X-Gm-Message-State: ALoCoQmQCuzN3U8ypFs+kAI14zobDDVpDk1YM1vVy0cCwzUHEW5doVWodlnXpajFfl2sG/FxYc0z X-Received: by 10.66.218.168 with SMTP id ph8mr27296148pac.95.1426743999707; Wed, 18 Mar 2015 22:46:39 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([114.30.40.58]) by mx.google.com with ESMTPSA id j4sm655258pdk.76.2015.03.18.22.46.36 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Mar 2015 22:46:38 -0700 (PDT) From: Baolin Wang To: richardcochran@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, john.stultz@linaro.com, tglx@linutronix.de, arnd@linaro.org, baolin.wang@linaro.org Subject: [PATCH 3/4] ptp/pch:Replace timespec with ktime_t in ptp_pch.c Date: Thu, 19 Mar 2015 13:45:08 +0800 Message-Id: <1426743909-24335-4-git-send-email-baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1426743909-24335-1-git-send-email-baolin.wang@linaro.org> References: <1426743909-24335-1-git-send-email-baolin.wang@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch changes the 32-bit time type (timespec) to the 64-bit one (ktime_t), since 32-bit time types will break in the year 2038. This patch implements the getktime/setktime interfaces with "ktime_t" type, and removed the gettime/settime interfaces with "timespec" type in ptp_pch.c file. Signed-off-by: Baolin Wang --- drivers/ptp/ptp_pch.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index 2554872..c759225 100644 --- a/drivers/ptp/ptp_pch.c +++ b/drivers/ptp/ptp_pch.c @@ -449,36 +449,27 @@ static int ptp_pch_adjtime(struct ptp_clock_info *ptp, s64 delta) return 0; } -static int ptp_pch_gettime(struct ptp_clock_info *ptp, struct timespec *ts) +static int ptp_pch_getktime(struct ptp_clock_info *ptp, ktime_t *kt) { - u64 ns; - u32 remainder; unsigned long flags; struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps); struct pch_ts_regs __iomem *regs = pch_dev->regs; spin_lock_irqsave(&pch_dev->register_lock, flags); - ns = pch_systime_read(regs); + *kt = ns_to_ktime(pch_systime_read(regs)); spin_unlock_irqrestore(&pch_dev->register_lock, flags); - ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder); - ts->tv_nsec = remainder; return 0; } -static int ptp_pch_settime(struct ptp_clock_info *ptp, - const struct timespec *ts) +static int ptp_pch_setktime(struct ptp_clock_info *ptp, ktime_t kt) { - u64 ns; unsigned long flags; struct pch_dev *pch_dev = container_of(ptp, struct pch_dev, caps); struct pch_ts_regs __iomem *regs = pch_dev->regs; - ns = ts->tv_sec * 1000000000ULL; - ns += ts->tv_nsec; - spin_lock_irqsave(&pch_dev->register_lock, flags); - pch_systime_write(regs, ns); + pch_systime_write(regs, ktime_to_ns(kt)); spin_unlock_irqrestore(&pch_dev->register_lock, flags); return 0; @@ -518,8 +509,8 @@ static struct ptp_clock_info ptp_pch_caps = { .pps = 0, .adjfreq = ptp_pch_adjfreq, .adjtime = ptp_pch_adjtime, - .gettime = ptp_pch_gettime, - .settime = ptp_pch_settime, + .getktime = ptp_pch_getktime, + .setktime = ptp_pch_setktime, .enable = ptp_pch_enable, };