From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753856AbbFATqr (ORCPT ); Mon, 1 Jun 2015 15:46:47 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56361 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752852AbbFATqk (ORCPT ); Mon, 1 Jun 2015 15:46:40 -0400 From: Arnd Bergmann To: Xunlei Pang Cc: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, Alessandro Zummo , John Stultz , Xunlei Pang , alexandre.belloni@free-electrons.com Subject: Re: [PATCH RESEND 1/3] drivers/rtc/pcf8563: Replace deprecated rtc_time_to_tm() and rtc_tm_to_time() Date: Mon, 01 Jun 2015 21:46:29 +0200 Message-ID: <2840029.d0aORC2jsD@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1432911877-607-1-git-send-email-xlpang@126.com> References: <1432911877-607-1-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:05ByTD/oBZIBBtLYVdH9pE1V5JE6gvDezbZFHS5mQzroLfMKxZJ TxWcV+x/CwPxsiniyUDx3FmREje9Vwe+/WQuC+JpjpBIP9wIcEPVNkLEyu+TWmOfQdblcG1 jmWkIl24W6Rkt0kEl1Q2G88ujlrbiInb6vfJmhJfk62dDfWcqPe792whTl6ibSYNsuJqLSa fOIH+flZeZzXWprZg6CtQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:IOH2OLSZ15s=:0ClMkyviyzImmjPcqdyX0i 9O6R11R0XO9+U6umdipcOkUSBiLSZEfNH2tkMQzCs975oDdWo+clryYylLDHfY6yMTxDxbPAr CtX/wlJLDEnEo3WPXvxpX27DFoHzO2GD33dL9T8HKbeH69LZ5BTUHEraPU1/lA7/Y8GQX73zJ eSkgy4p9mMyLKaxpy6z3j+KuPqh4nys11cW5Adj5mj4bqnRV8L2rPKWlLKSfUlj1jXemkoU8z 8L+BK5lcY+JAkPwMC/A9Cn3fI6pZEQUFiLAE87C1tFNi5HbwMCB87BC/lHDrp4J77ZaRMpDD2 mCEat72tsu69SUHd0sdn+rMY7ft9LN07/JneWeVoh4EnmYRO47H/axc/kSsf9MUiQCIbC9+4j 1XBnTHu9530KkXyvP2LBUsX6llYEm1/M7Eiad13PrxunYTtlpmif6/bOqgWkm/R/VHZPh2bFb /MzC5N3+CvufrNbKuXOdBvTu+SmTeYZiCNSzAZ5D9iqAkC6aDwY5rz2MimaX700hRxFb+BSGM YY8b2NhmpWsHjS/mkD9UupKZjNzDGWKgDCB97LfH0coPbWn4OPHmxzYYUNDGwQhMr7mVD/71c 8De/f1aDMrSjT73U1nYOmH+sBlsVjJTW+1p5Z3Z8Qz921WK6VGzfeNxohOBFSGG27KI1/rvvO j5V+UDxRpyA6gAJ5/tC3nqELpwnRZ+puqmdN6u5HqaJwKpA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday 29 May 2015 23:04:35 Xunlei Pang wrote: > From: Xunlei Pang > > pcf8563_rtc_set_alarm() 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_time_to_tm() with rtc_time64_to_tm() > - Replacing rtc_tm_to_time() with rtc_tm_to_time64() > > Signed-off-by: Xunlei Pang (adding alexandre to Cc) Looks good to me, Acked-by: Arnd Bergmann > drivers/rtc/rtc-pcf8563.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c > index 0ba7e59..5f87f84 100644 > --- a/drivers/rtc/rtc-pcf8563.c > +++ b/drivers/rtc/rtc-pcf8563.c > @@ -363,13 +363,13 @@ static int pcf8563_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm) > struct i2c_client *client = to_i2c_client(dev); > unsigned char buf[4]; > int err; > - unsigned long alarm_time; > > /* The alarm has no seconds, round up to nearest minute */ > if (tm->time.tm_sec) { > - rtc_tm_to_time(&tm->time, &alarm_time); > - alarm_time += 60-tm->time.tm_sec; > - rtc_time_to_tm(alarm_time, &tm->time); > + time64_t alarm_time = rtc_tm_to_time64(&tm->time); > + > + alarm_time += 60 - tm->time.tm_sec; > + rtc_time64_to_tm(alarm_time, &tm->time); > } > > dev_dbg(dev, "%s, min=%d hour=%d wday=%d mday=%d " >