From patchwork Wed Apr 15 09:20:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 461434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qk0-x237.google.com (mail-qk0-x237.google.com [IPv6:2607:f8b0:400d:c09::237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D5B08140079 for ; Wed, 15 Apr 2015 19:21:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="2048-bit key; unprotected key" header.d=googlegroups.com header.i=@googlegroups.com header.b=vXKzBQxg; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: by qkbw1 with SMTP id w1sf55050209qkb.1 for ; Wed, 15 Apr 2015 02:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:content-type:precedence:mailing-list:list-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe; bh=AHIDBvbcCSadrrdFNgNCFsUGc4LbgUReTN2CQi+dzq4=; b=vXKzBQxgSkQD/IulfmVn7Fb9Naa5yd4rCnHvCarRkFVkddpc0IIjiaSHfdQ1Amxn5h l2rok9VnjJ9nK3CidBJp4XxlX4aos/pZVbGkQBWuSIRSq05tZ9u4pu0RCuz57IIl8z+S 4L+oaf+tFaYSlDDwKDChXPzhS/WHeAmHaD51iapOlLe02FqAWZywzTmtFGMJl7ZGCOOL t9NSWO9ECbeuQSrIKSAk4NbKlm03G1Tiu+3VWjh+CfNYQ84V0V96GzK48xVnd1kH09UX J2etiFwvN6JAExHCeaiUQqQeu45qdCb6rb/kShWfwkoQ/skJuDRD+jDTr0G8WdTtFVBV Kwbg== X-Received: by 10.140.89.116 with SMTP id u107mr320647qgd.18.1429089682008; Wed, 15 Apr 2015 02:21:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.140.48.9 with SMTP id n9ls628689qga.58.gmail; Wed, 15 Apr 2015 02:21:21 -0700 (PDT) X-Received: by 10.140.152.2 with SMTP id 2mr17097961qhy.3.1429089681827; Wed, 15 Apr 2015 02:21:21 -0700 (PDT) Received: from m15-111.126.com (m15-111.126.com. [220.181.15.111]) by gmr-mx.google.com with ESMTP id xv6si459365pab.2.2015.04.15.02.21.20 for ; Wed, 15 Apr 2015 02:21:21 -0700 (PDT) Received-SPF: pass (google.com: domain of xlpang@126.com designates 220.181.15.111 as permitted sender) client-ip=220.181.15.111; Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp1 (Coremail) with SMTP id C8mowEDJuURQLS5VuDFEAA--.7421S5; Wed, 15 Apr 2015 17:20:31 +0800 (CST) From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Alessandro Zummo , John Stultz , Arnd Bergmann , Xunlei Pang , Russell King Subject: [rtc-linux] [PATCH 4/5] drivers/rtc/pl030: Replace deprecated rtc_tm_to_time() and rtc_time_to_tm() Date: Wed, 15 Apr 2015 17:20:10 +0800 Message-Id: <1429089611-29776-4-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429089611-29776-1-git-send-email-xlpang@126.com> References: <1429089611-29776-1-git-send-email-xlpang@126.com> X-CM-TRANSID: C8mowEDJuURQLS5VuDFEAA--.7421S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7AF45urWUWr45Zry5Cr1fCrg_yoW8tw1kpF WUua98Jr4Iqr9ag3WDtr1kuFsxGw1xJa47Wr4xK39a93WkJw1ktFy8Cr9avry5Jas5GFW7 JF4rJF98Gr1UGFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jm4E_UUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbimgDcv1GfV7g4fAAAsc X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of xlpang@126.com designates 220.181.15.111 as permitted sender) smtp.mail=xlpang@126.com; dkim=pass header.i=@126.com; dmarc=pass (p=NONE dis=NONE) header.from=126.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Xunlei Pang The driver uses deprecated rtc_tm_to_time() and rtc_time_to_tm(), which will overflow in year 2106 on 32-bit machines. This patch solves this by: - Replacing rtc_tm_to_time() with rtc_tm_to_time64() - Replacing rtc_time_to_tm() with rtc_time64_to_tm() Cc: Russell King Signed-off-by: Xunlei Pang --- drivers/rtc/rtc-pl030.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index f85a1a9..d874b6e 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c @@ -39,32 +39,34 @@ static int pl030_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - rtc_time_to_tm(readl(rtc->base + RTC_MR), &alrm->time); + rtc_time64_to_tm(readl(rtc->base + RTC_MR), &alrm->time); return 0; } static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - unsigned long time; + time64_t time; int ret; /* * At the moment, we can only deal with non-wildcarded alarm times. */ ret = rtc_valid_tm(&alrm->time); - if (ret == 0) - ret = rtc_tm_to_time(&alrm->time, &time); - if (ret == 0) - writel(time, rtc->base + RTC_MR); - return ret; + if (ret) + return ret; + + time = rtc_tm_to_time64(&alrm->time); + writel(time, rtc->base + RTC_MR); + + return 0; } static int pl030_read_time(struct device *dev, struct rtc_time *tm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - rtc_time_to_tm(readl(rtc->base + RTC_DR), tm); + rtc_time64_to_tm(readl(rtc->base + RTC_DR), tm); return 0; } @@ -80,14 +82,12 @@ static int pl030_read_time(struct device *dev, struct rtc_time *tm) static int pl030_set_time(struct device *dev, struct rtc_time *tm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - unsigned long time; - int ret; + time64_t time; - ret = rtc_tm_to_time(tm, &time); - if (ret == 0) - writel(time + 1, rtc->base + RTC_LR); + time = rtc_tm_to_time64(tm); + writel(time + 1, rtc->base + RTC_LR); - return ret; + return 0; } static const struct rtc_class_ops pl030_ops = {