From patchwork Tue Jun 2 09:04:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 49350 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 140C42052D for ; Tue, 2 Jun 2015 09:08:36 +0000 (UTC) Received: by wgez8 with SMTP id z8sf39043692wge.2 for ; Tue, 02 Jun 2015 02:08:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=0DVytP8IWLjdSSu+hvpXCbcUHGxKk2fIQ9NEF4MwKOg=; b=cSFiBihiuC86Upi5jsZ5Xzjw9TEecOebVIx+eF/ms9roxR5l4U7bbFfp8VXNLcPaVl K6398UFIE8rkUyFGnXHSGsq3wujNHNB2O4XY5y3EDLn8CK+PfvqYbepRcNOWaq0J1gui PswokUovhxopOhrYN/xWe+OOzcuAa0KWmCX1r0s3j0A1Gj69SuuIb/lmZB7qrxByBlym X+qugKuqmlyhMtVUIhd0u+WvUrH2L9xb4RSOriH0LRL/nxc+FtOPYHq4B5Ku9NZYdOKY 8ANS7vUuBGRV0CvtHKz+bCMjKLM2G74dm+jRAfVANzS7MlML2jDRI4l+3fVukYEIRpTz dhrA== X-Gm-Message-State: ALoCoQlk0diQhTdQoB09EJgZSpvG9rnCYzqOVTpxHZScsMWRIWeELENomE8Z/fncyiEC0c9mpP3j X-Received: by 10.112.203.168 with SMTP id kr8mr24978650lbc.10.1433236115262; Tue, 02 Jun 2015 02:08:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.65 with SMTP id lu1ls683864lac.104.gmail; Tue, 02 Jun 2015 02:08:35 -0700 (PDT) X-Received: by 10.152.7.7 with SMTP id f7mr25472060laa.106.1433236115072; Tue, 02 Jun 2015 02:08:35 -0700 (PDT) Received: from mail-la0-x234.google.com (mail-la0-x234.google.com. [2a00:1450:4010:c03::234]) by mx.google.com with ESMTPS id ca9si14567848lad.33.2015.06.02.02.08.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 02:08:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::234 as permitted sender) client-ip=2a00:1450:4010:c03::234; Received: by labko7 with SMTP id ko7so116829855lab.2 for ; Tue, 02 Jun 2015 02:08:35 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr15554111lac.41.1433236114928; Tue, 02 Jun 2015 02:08:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2910204lbb; Tue, 2 Jun 2015 02:08:33 -0700 (PDT) X-Received: by 10.70.51.67 with SMTP id i3mr48454013pdo.145.1433236112904; Tue, 02 Jun 2015 02:08:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pc7si25496600pac.69.2015.06.02.02.08.31; Tue, 02 Jun 2015 02:08:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758613AbbFBJI0 (ORCPT + 28 others); Tue, 2 Jun 2015 05:08:26 -0400 Received: from m50-110.126.com ([123.125.50.110]:46120 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755977AbbFBJIJ (ORCPT ); Tue, 2 Jun 2015 05:08:09 -0400 Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp4 (Coremail) with SMTP id jdKowADHAkWqcW1V1JEqAQ--.1798S4; Tue, 02 Jun 2015 17:04:50 +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 , Herbert Valerio Riedel Subject: [PATCH v2 3/4] drivers/rtc/isl1208: Replace deprecated rtc_tm_to_time() Date: Tue, 2 Jun 2015 17:04:21 +0800 Message-Id: <1433235862-1638-3-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--.1798S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zw4kGr4kKF4DXF1rJFW5Jrb_yoW8GF1fpF 47K3s0vrs2qryfWw1DAF18uayrGayUtaykKFZrJa9a93WfX3WDKFW0kr4I9Fy5Xa95C3y3 WF1SkF15tr1UWa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jvUDJUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXBINv1R0Wcs-1QAAsk Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::234 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=126.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Xunlei Pang isl1208_i2c_set_alarm() 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() Cc: Herbert Valerio Riedel Signed-off-by: Xunlei Pang --- drivers/rtc/rtc-isl1208.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index c3c549d..6eb5d36 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c @@ -370,22 +370,15 @@ isl1208_i2c_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm) struct rtc_time *alarm_tm = &alarm->time; u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; const int offs = ISL1208_REG_SCA; - unsigned long rtc_secs, alarm_secs; struct rtc_time rtc_tm; int err, enable; err = isl1208_i2c_read_time(client, &rtc_tm); if (err) return err; - err = rtc_tm_to_time(&rtc_tm, &rtc_secs); - if (err) - return err; - err = rtc_tm_to_time(alarm_tm, &alarm_secs); - if (err) - return err; /* If the alarm time is before the current time disable the alarm */ - if (!alarm->enabled || alarm_secs <= rtc_secs) + if (!alarm->enabled || rtc_tm_subtract(alarm_tm, &rtc_tm) <= 0) enable = 0x00; else enable = 0x80;