From patchwork Wed Apr 15 09:20:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 47166 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 937E620553 for ; Wed, 15 Apr 2015 09:22:02 +0000 (UTC) Received: by wizk4 with SMTP id k4sf10013865wiz.2 for ; Wed, 15 Apr 2015 02:22:01 -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=dSnhp+1AEWcdmqf8HAevo7W/yFOL4N7lsbYonpo7paQ=; b=QgqCSU2ata+ENyw5yGPLoS3iWZMkec/5Sz/e/L4Y8b0r8ZyoiQD/h8VnNiK7OHpArt xfYUDinJ5VpQfLkGx8kpAouL/DTvJic7wFEhV4WHeAMEzKFLPXZMb9AX1U76zbW+c5p5 kgiXZB1vEwsgWKmPyPgr8K5jQvP5/byGxMSXY4YevfA1pCnQ6CQtBK6LHKT0l5+sNE35 5DoAngnwJ7gdXwh+yQ4rvOjTQqmWFP97qN15THeVTpv7xDzNbFKxJutWB+gei/IgADs1 LDeaqDlpDHJzJGL5CyTZHm8vzpWCjWfopO0WyliJrxYj17k+6zaVgDqRLi/GrfQfZcHj D/YA== X-Gm-Message-State: ALoCoQmt8XfKdDFXrh9Frm+OJrqIoatRp3exESc5Owm8ZW0Q2tbse+XijdGs39nZ4BVMn+xnkqgi X-Received: by 10.180.101.39 with SMTP id fd7mr4344679wib.0.1429089721859; Wed, 15 Apr 2015 02:22:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.164.230 with SMTP id yt6ls169563lab.39.gmail; Wed, 15 Apr 2015 02:22:01 -0700 (PDT) X-Received: by 10.112.93.72 with SMTP id cs8mr22891851lbb.15.1429089721667; Wed, 15 Apr 2015 02:22:01 -0700 (PDT) Received: from mail-lb0-x22d.google.com (mail-lb0-x22d.google.com. [2a00:1450:4010:c04::22d]) by mx.google.com with ESMTPS id f4si3388086lbv.47.2015.04.15.02.22.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 02:22:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22d as permitted sender) client-ip=2a00:1450:4010:c04::22d; Received: by lbbzk7 with SMTP id zk7so29134230lbb.0 for ; Wed, 15 Apr 2015 02:22:01 -0700 (PDT) X-Received: by 10.112.16.196 with SMTP id i4mr22527571lbd.72.1429089721534; Wed, 15 Apr 2015 02:22:01 -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.67.65 with SMTP id l1csp2383231lbt; Wed, 15 Apr 2015 02:22:00 -0700 (PDT) X-Received: by 10.68.65.41 with SMTP id u9mr44043957pbs.155.1429089718750; Wed, 15 Apr 2015 02:21:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d5si6102219pdm.207.2015.04.15.02.21.57; Wed, 15 Apr 2015 02:21:58 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932381AbbDOJVv (ORCPT + 27 others); Wed, 15 Apr 2015 05:21:51 -0400 Received: from m15-111.126.com ([220.181.15.111]:45583 "EHLO m15-111.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932198AbbDOJVY (ORCPT ); Wed, 15 Apr 2015 05:21:24 -0400 Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp1 (Coremail) with SMTP id C8mowEDJuURQLS5VuDFEAA--.7421S3; Wed, 15 Apr 2015 17:20:26 +0800 (CST) From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Alessandro Zummo , John Stultz , Arnd Bergmann , Xunlei Pang , Herbert Valerio Riedel Subject: [PATCH 2/5] drivers/rtc/isl1208: Replace deprecated rtc_tm_to_time() Date: Wed, 15 Apr 2015 17:20:08 +0800 Message-Id: <1429089611-29776-2-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--.7421S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zw4kGr4kKF4DXF48Cw48Zwb_yoW8GFWUpF 42k3s0vrs2qr93WrnFyF1DuFWrGa4UtaykGFWxJa9a93WfX3WDKFWFkr409ryUXa1kC3y3 WF1YyF15Kr1Uu3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jToGQUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiWxvcv1PM78qp8wAAsD 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:c04::22d 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_to_time64() Cc: Herbert Valerio Riedel Signed-off-by: Xunlei Pang --- drivers/rtc/rtc-isl1208.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index c3c549d..06113e8 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c @@ -370,19 +370,16 @@ 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; + time64_t 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; + + rtc_secs = rtc_tm_to_time64(&rtc_tm); + alarm_secs = rtc_tm_to_time64(alarm_tm); /* If the alarm time is before the current time disable the alarm */ if (!alarm->enabled || alarm_secs <= rtc_secs)