From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753927AbbFATtp (ORCPT ); Mon, 1 Jun 2015 15:49:45 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60075 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752701AbbFATti (ORCPT ); Mon, 1 Jun 2015 15:49:38 -0400 From: Arnd Bergmann To: Xunlei Pang Cc: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, Alessandro Zummo , John Stultz , Xunlei Pang , Herbert Valerio Riedel Subject: Re: [PATCH RESEND 2/3] drivers/rtc/isl1208: Replace deprecated rtc_tm_to_time() Date: Mon, 01 Jun 2015 21:49:24 +0200 Message-ID: <2324798.u1fgEdZHfl@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1432911877-607-2-git-send-email-xlpang@126.com> References: <1432911877-607-1-git-send-email-xlpang@126.com> <1432911877-607-2-git-send-email-xlpang@126.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:z8f+hOs4pUhGoKUmlAJuxp0OAs4ppauoIGMt3+DTB4a46sPOTff BnhVV0+q6HxSrcNMj96gmMEJo0h8/giqLMaByc319yyVFplaPuothTSF2oPG/Jx27jZm3fy n88eYMUx1YGkFJexm7vJ4EzHci4ejNvjstfIULESexDNzGWuu6gMzGjrVE5Mc4/pG8Jjfbt 3Zht6jIe6d2MtJU7GSC+A== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday 29 May 2015 23:04:36 Xunlei Pang wrote: > 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(-) The patch looks correct, but I wonder if this is the best solution. The only use of the two time values in the function is in the 'alarm_secs <= rtc_secs' comparison. Maybe we should introduce an 'rtc_tm_before' helper function that performs the same check? Do other drivers use the same piece of code as this one? Arnd > 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) >