From patchwork Tue Jun 20 09:35:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 9799075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5626B60329 for ; Tue, 20 Jun 2017 09:39:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AD1126B41 for ; Tue, 20 Jun 2017 09:39:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F92A2810E; Tue, 20 Jun 2017 09:39:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5F25283AF for ; Tue, 20 Jun 2017 09:39:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbdFTJix (ORCPT ); Tue, 20 Jun 2017 05:38:53 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:34436 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753160AbdFTJit (ORCPT ); Tue, 20 Jun 2017 05:38:49 -0400 Received: by mail-wr0-f177.google.com with SMTP id 77so88387315wrb.1 for ; Tue, 20 Jun 2017 02:38:49 -0700 (PDT) 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=TdpIIooO/DrV3Wh1+d/0bmKHvQdqXVWegBFgsnzngmkIeZkbwgczuRJq6bb0d4j/ut 2P8FvwqHJt1Zhz6SMMdwZr5UdHxyriO2mlj3/VwTL/2GP7aET3iJs4JbgJdxf89cPi4I 3/drO5QMLBINq0DiPD/7r5ASztGHJoIolagM3tj/q+I48pVeYvhEOaccZORaYvfooKM6 6g9OewjPibIvEu7D87Pj+2eN5oVm2dHQaF5vqiiI1lLkse4V9jce8w0ER/gtgb8/uweW ofRS+txYtS6oedP+rphSn7FgDHjAN3Kzv0bB3mOVMWnZ0pHlA1nf1cNLtgXTN01v50YF lMpw== X-Gm-Message-State: AKS2vOxMp4IiEMLQgLRkroFsJs/ZUXvoKTPwm5jUWeQgptnaDvoxassS J0etVRmLwqGNvAAm X-Received: by 10.223.161.219 with SMTP id v27mr3197605wrv.135.1497951523630; Tue, 20 Jun 2017 02:38:43 -0700 (PDT) Received: from lmenx321.st.com. ([80.215.93.217]) by smtp.gmail.com with ESMTPSA id e24sm4482318wrc.35.2017.06.20.02.38.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 02:38:43 -0700 (PDT) From: Benjamin Gaignard To: benjamin.gaignard@linaro.org Cc: linaro-kernel@lists.linaro.org, "Rafael J. Wysocki" , Pavel Machek , Len Brown , Alessandro Zummo , Alexandre Belloni , rtc-linux@googlegroups.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 51/51] power: suspend test: stop using rtc deprecated functions Date: Tue, 20 Jun 2017 11:35:59 +0200 Message-Id: <1497951359-13334-52-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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 CC: "Rafael J. Wysocki" CC: Pavel Machek CC: Len Brown CC: Alessandro Zummo CC: Alexandre Belloni CC: rtc-linux@googlegroups.com CC: linux-pm@vger.kernel.org CC: linux-kernel@vger.kernel.org Acked-by: Pavel Machek --- 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);