Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943AbdFTJiK (ORCPT ); Tue, 20 Jun 2017 05:38:10 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35334 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752915AbdFTJiG (ORCPT ); Tue, 20 Jun 2017 05:38:06 -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 24/51] rtc: ds2404: stop using rtc deprecated functions Date: Tue, 20 Jun 2017 11:35:32 +0200 Message-Id: <1497951359-13334-25-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: 1643 Lines: 50 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-ds2404.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-ds2404.c b/drivers/rtc/rtc-ds2404.c index 9a1582e..b7d04a7 100644 --- a/drivers/rtc/rtc-ds2404.c +++ b/drivers/rtc/rtc-ds2404.c @@ -201,16 +201,16 @@ static void ds2404_enable_osc(struct device *dev) static int ds2404_read_time(struct device *dev, struct rtc_time *dt) { - unsigned long time = 0; + unsigned long long time = 0; ds2404_read_memory(dev, 0x203, 4, (u8 *)&time); time = le32_to_cpu(time); - rtc_time_to_tm(time, dt); + rtc_time64_to_tm(time, dt); return rtc_valid_tm(dt); } -static int ds2404_set_mmss(struct device *dev, unsigned long secs) +static int ds2404_set_mmss64(struct device *dev, time64_t secs) { u32 time = cpu_to_le32(secs); ds2404_write_memory(dev, 0x203, 4, (u8 *)&time); @@ -219,7 +219,7 @@ static int ds2404_set_mmss(struct device *dev, unsigned long secs) static const struct rtc_class_ops ds2404_rtc_ops = { .read_time = ds2404_read_time, - .set_mmss = ds2404_set_mmss, + .set_mmss64 = ds2404_set_mmss64, }; static int rtc_probe(struct platform_device *pdev) -- 1.9.1