Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1670548

[PATCH 51/51] power: suspend test: stop using rtc deprecated functions

Path csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From Benjamin Gaignard <benjamin.gaignard@linaro.org>
Newsgroups linux.kernel
Subject [PATCH 51/51] power: suspend test: stop using rtc deprecated functions
Date Tue, 20 Jun 2017 11:40:03 +0200
Message-ID <tUnNF-6PZ-45@gated-at.bofh.it> (permalink)
References <tUnNE-6PZ-15@gated-at.bofh.it>
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8XXioQipp3igOlPonRcLWMszRPWDIIQ21sTTscbKVQA=; b=T7N6+9Sl19gDHz/33+XHIcAFTE+iJZdNsZCQwsZBg3p04S6q1LLdfSIrokfFSN3L8U cc+5IIi7bLZpo9jETl58Cpi11pwWTcUHHntxI+4eyY1HQuESUYGkZS98nAQFkqWXhWTu 5hfaOoIWAeorfq5JuycD1o9miIRf8RbCTsO20=
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8XXioQipp3igOlPonRcLWMszRPWDIIQ21sTTscbKVQA=; b=k085dVpIWHDe0s8mEUaabQ1whYubPIGoQiHSqxb3u4TFE/lWVainnkW6q38BGOenDM ZNiWI18lOWUqoId6qx287mpXUdM6y8Y6LnjB25hx92k206igVUZCZRMW3aS/MHX1PE6k foncT7+N54ci5PVFoZ0nKbLhnUPPYSZkpYOWnuU++K4Z8nY2rF6IJ7lmjoBixEFEroHQ P5yu74yPRltXBfEdzUc/75wjgKivoogu0lJNZjFMes/navMSB6HwGkYbsECs+h734Cbb 5hIHZwUC2ZKq8N6zdEm36bl1SOzE2uEhhmM5LW0LwDaTsqghkRSyPkUoLmjynWW/Mm4J y/Zw==
X-Gm-Message-State AKS2vOxedkN1wJtuwfGPRrxQtCJxUwKQKSgPf8IKHFxY708PYWnS8v/A DaSPbfpIg9zxNGuk
X-Received by 10.223.161.219 with SMTP id v27mr3197605wrv.135.1497951523630; Tue, 20 Jun 2017 02:38:43 -0700 (PDT)
X-Mailer git-send-email 1.9.1
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 45
Organization linux.* mail to news gateway
X-Original-Cc linaro-kernel@lists.linaro.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>, Alessandro Zummo <a.zummo@towertech.it>, Alexandre Belloni <alexandre.belloni@free-electrons.com>, rtc-linux@googlegroups.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date Tue, 20 Jun 2017 11:35:59 +0200
X-Original-Message-ID <1497951359-13334-52-git-send-email-benjamin.gaignard@linaro.org>
X-Original-References <1497951359-13334-1-git-send-email-benjamin.gaignard@linaro.org>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1670548

Show key headers only | View raw


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.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
CC: "Rafael J. Wysocki" <rjw@rjwysocki.net>
CC: Pavel Machek <pavel@ucw.cz>
CC: Len Brown <len.brown@intel.com>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Alexandre Belloni <alexandre.belloni@free-electrons.com>
CC: rtc-linux@googlegroups.com
CC: linux-pm@vger.kernel.org
CC: linux-kernel@vger.kernel.org
---
 kernel/power/suspend_test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 5db2170..334a893 100644
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -71,7 +71,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
 	static char info_test[] __initdata =
 		KERN_INFO "PM: test RTC wakeup from '%s' suspend\n";
 
-	unsigned long		now;
+	unsigned long long		now;
 	struct rtc_wkalrm	alm;
 	int			status;
 
@@ -82,10 +82,10 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state)
 		printk(err_readtime, dev_name(&rtc->dev), status);
 		return;
 	}
-	rtc_tm_to_time(&alm.time, &now);
+	now = rtc_tm_to_time64(&alm.time);
 
 	memset(&alm, 0, sizeof alm);
-	rtc_time_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time);
+	rtc_time64_to_tm(now + TEST_SUSPEND_SECONDS, &alm.time);
 	alm.enabled = true;
 
 	status = rtc_set_alarm(rtc, &alm);
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread


Thread

[PATCH 51/51] power: suspend test: stop using rtc deprecated functions Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-06-20 11:40 +0200
  Re: [PATCH 51/51] power: suspend test: stop using rtc deprecated  functions Pavel Machek <pavel@ucw.cz> - 2017-06-20 14:20 +0200

csiph-web