Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752860AbdFTJh6 (ORCPT ); Tue, 20 Jun 2017 05:37:58 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38710 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbdFTJhy (ORCPT ); Tue, 20 Jun 2017 05:37:54 -0400 From: Benjamin Gaignard To: benjamin.gaignard@linaro.org Cc: linaro-kernel@lists.linaro.org, Alessandro Zummo , Alexandre Belloni , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH 23/51] rtc: ds1672: stop using rtc deprecated functions Date: Tue, 20 Jun 2017 11:35:31 +0200 Message-Id: <1497951359-13334-24-git-send-email-benjamin.gaignard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497951359-13334-1-git-send-email-benjamin.gaignard@linaro.org> References: <1497951359-13334-1-git-send-email-benjamin.gaignard@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1981 Lines: 57 rtc_time_to_tm() and rtc_tm_to_time() are deprecated because they rely on 32bits variables and that will make rtc break in y2038/2016. Stop using those two functions to safer 64bits ones. For the same reasons use set_mmss64 callback instead of set_mmss Signed-off-by: Benjamin Gaignard CC: Alessandro Zummo CC: Alexandre Belloni CC: rtc-linux@googlegroups.com CC: linux-kernel@vger.kernel.org --- drivers/rtc/rtc-ds1672.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index 7bf46bf..ff2468c 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c @@ -30,7 +30,7 @@ */ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) { - unsigned long time; + unsigned long long time; unsigned char addr = DS1672_REG_CNT_BASE; unsigned char buf[4]; @@ -60,7 +60,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; - rtc_time_to_tm(time, tm); + rtc_time64_to_tm(time, tm); dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " "mday=%d, mon=%d, year=%d, wday=%d\n", @@ -96,7 +96,7 @@ static int ds1672_rtc_read_time(struct device *dev, struct rtc_time *tm) return ds1672_get_datetime(to_i2c_client(dev), tm); } -static int ds1672_rtc_set_mmss(struct device *dev, unsigned long secs) +static int ds1672_rtc_set_mmss64(struct device *dev, time64_t secs) { return ds1672_set_mmss(to_i2c_client(dev), secs); } @@ -148,7 +148,7 @@ static ssize_t show_control(struct device *dev, struct device_attribute *attr, static const struct rtc_class_ops ds1672_rtc_ops = { .read_time = ds1672_rtc_read_time, - .set_mmss = ds1672_rtc_set_mmss, + .set_mmss64 = ds1672_rtc_set_mmss64, }; static int ds1672_probe(struct i2c_client *client, -- 1.9.1