From patchwork Tue Jun 2 09:04:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 479349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ig0-x23e.google.com (mail-ig0-x23e.google.com [IPv6:2607:f8b0:4001:c05::23e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8C4421402AD for ; Tue, 2 Jun 2015 19:05:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=cFOS+v8/; dkim-atps=neutral Received: by igdj8 with SMTP id j8sf22980395igd.1 for ; Tue, 02 Jun 2015 02:05:53 -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=5Ksu+Dv53sPG5UiEzELpVcn/mXH0j8eNC/jEbXfQaz4=; b=cFOS+v8/PjP360HAyaBT5ZrPjbm+Mp7uHK/5rib4eGgyIxFtOdHHXsDGtyd+uWQIM7 EC3BoqPQ3L55XdWTtkTQfbYJ5nz7nk20EOKhHkELKyopvWNlYg8ClWTzKimte7bwhJ4n E1zSxKGh3K5hbkPsOXpislWnTyKIHGttQqcglxZ0XwQjGSYdPgwTymb94YtlPMSURed9 dW5x1KYckZqSRp8nYbFt+8d8ZPxcf6z/5pPmcvCNqOoBSYVGEZxLxLgp8dcrtLYBLe85 0jk613Hi2IMsyfyvPwRljPdrCbykSJyz3aFEofqocETZkog8kVvsLmAAqTnDXv4DswSE pUNQ== X-Received: by 10.50.138.70 with SMTP id qo6mr219687igb.13.1433235953320; Tue, 02 Jun 2015 02:05:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.78.169 with SMTP id c9ls1212605igx.44.canary; Tue, 02 Jun 2015 02:05:53 -0700 (PDT) X-Received: by 10.50.111.194 with SMTP id ik2mr21406013igb.4.1433235953117; Tue, 02 Jun 2015 02:05:53 -0700 (PDT) Received: from m50-110.126.com (m50-110.126.com. [123.125.50.110]) by gmr-mx.google.com with ESMTP id x1si1095175igb.2.2015.06.02.02.05.52 for ; Tue, 02 Jun 2015 02:05:53 -0700 (PDT) Received-SPF: pass (google.com: domain of xlpang@126.com designates 123.125.50.110 as permitted sender) client-ip=123.125.50.110; Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp4 (Coremail) with SMTP id jdKowADHAkWqcW1V1JEqAQ--.1798S5; Tue, 02 Jun 2015 17:04:52 +0800 (CST) From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Alessandro Zummo , Alexandre Belloni , John Stultz , Arnd Bergmann , Xunlei Pang , Carlo Caione Subject: [rtc-linux] [PATCH v2 4/4] drivers/rtc/sunxi: Replace deprecated rtc_tm_to_time() Date: Tue, 2 Jun 2015 17:04:22 +0800 Message-Id: <1433235862-1638-4-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433235862-1638-1-git-send-email-xlpang@126.com> References: <1433235862-1638-1-git-send-email-xlpang@126.com> X-CM-TRANSID: jdKowADHAkWqcW1V1JEqAQ--.1798S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF45Kr1xurW3tFyfXr4fKrg_yoW5Jr4kpa 1aqa43XrWjqrWagryxJFs5Za45Gw1UJ3yxtanxt3yF9an5JFn8Jr1kCryktr15Wr95Aay3 JFWrAa45uFy7Kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jDF4iUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXBINv1R0Wcs-1QABsl X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of xlpang@126.com designates 123.125.50.110 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 sunxi_rtc_setalarm() uses deprecated rtc_tm_to_time(), which will overflow in year 2106 on 32-bit machines. This patch solves this by: - Replacing rtc_tm_to_time() with rtc_tm_subtract() Also remove the unnecessary initial zeroing of some local variables in sunxi_rtc_setalarm(). Cc: Carlo Caione Signed-off-by: Xunlei Pang --- drivers/rtc/rtc-sunxi.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-sunxi.c b/drivers/rtc/rtc-sunxi.c index 6e678fa..ecff5ed 100644 --- a/drivers/rtc/rtc-sunxi.c +++ b/drivers/rtc/rtc-sunxi.c @@ -269,14 +269,13 @@ static int sunxi_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) struct sunxi_rtc_dev *chip = dev_get_drvdata(dev); struct rtc_time *alrm_tm = &wkalrm->time; struct rtc_time tm_now; - u32 alrm = 0; - unsigned long time_now = 0; - unsigned long time_set = 0; - unsigned long time_gap = 0; - unsigned long time_gap_day = 0; - unsigned long time_gap_hour = 0; - unsigned long time_gap_min = 0; - int ret = 0; + u32 alrm; + time64_t diff; + unsigned long time_gap; + unsigned long time_gap_day; + unsigned long time_gap_hour; + unsigned long time_gap_min; + int ret; ret = sunxi_rtc_gettime(dev, &tm_now); if (ret < 0) { @@ -284,14 +283,18 @@ static int sunxi_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) return -EINVAL; } - rtc_tm_to_time(alrm_tm, &time_set); - rtc_tm_to_time(&tm_now, &time_now); - if (time_set <= time_now) { + diff = rtc_tm_subtract(alrm_tm, &tm_now); + if (diff <= 0) { dev_err(dev, "Date to set in the past\n"); return -EINVAL; } - time_gap = time_set - time_now; + if (diff > 255 * SEC_IN_DAY) { + dev_err(dev, "Day must be in the range 0 - 255\n"); + return -EINVAL; + } + + time_gap = diff; time_gap_day = time_gap / SEC_IN_DAY; time_gap -= time_gap_day * SEC_IN_DAY; time_gap_hour = time_gap / SEC_IN_HOUR; @@ -299,11 +302,6 @@ static int sunxi_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) time_gap_min = time_gap / SEC_IN_MIN; time_gap -= time_gap_min * SEC_IN_MIN; - if (time_gap_day > 255) { - dev_err(dev, "Day must be in the range 0 - 255\n"); - return -EINVAL; - } - sunxi_rtc_setaie(0, chip); writel(0, chip->base + SUNXI_ALRM_DHMS); usleep_range(100, 300);