From patchwork Tue Jun 20 09:35:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 105965 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1276291qgd; Tue, 20 Jun 2017 02:42:32 -0700 (PDT) X-Received: by 10.84.228.207 with SMTP id y15mr11272702pli.13.1497951752370; Tue, 20 Jun 2017 02:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497951752; cv=none; d=google.com; s=arc-20160816; b=ZcLTf58lNxiXr/ungFT3qOdSR0Hmld8CHBIhPh9VtyFj0LtQFWAuMLEbCU70iy7xQe un4mWzJxbxg7GeT5v6GI/XV58IXD3UFKZp+19AJW7sKCTMoZItVyESUQKjxEc33sIacl 7ibja+brlpNUZ3gReWq3Y6PpeSlnNhUxsgC4wkvE2jhPetLq31GeJgnHdhoSPqYFoQUc 8mB8XYrBOGycUkeYMGpCNbVW/xxijRIzuy/i6K1x9yNLWhafP5WbXdZUjrT3dcgI4EL3 kUGHzDDpxVVmiZHcXIbg8ADOgfr4R6jx/bx9hDG3IGUQO9tTY/b3CN7uEpCttFD3wOQg 2b7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=N5o21xjhsfYiOkiAvAc8xDLniSaY3M4Z9yubD+7kWIo=; b=Gymy8P4SmVbUUKC9U+vlfTjZixZ/ZUQXzn58DB8STXliale92ikeHKzvvjaAU6s2PG oeKziSu4fX2L8820S5OzKjKREWyl+NlI5YQ5wxyCbTtxGvJi6ypLyi55qLw9Z/bpO2iq VOqtE9Sm8xBeDjunP4iJL4+hPsBhr3yC3TMCA9VEvI9dqOPfHXphIkA19hfwVduGhppy cMTQe8I7/iLQzTM6dJDLA52aLql/FFvzRo7OSZOarF9yXrohFGA9psHXTT/v+weIeHBl oSK0sBiDHDA+CN00z2RL+Aloi7Yw78xh+2nLRE5uzAJMoKCdQBy2okPr025nq0ZL8m/+ h49g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=be1UQMm1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j62si4587595pfc.194.2017.06.20.02.42.32; Tue, 20 Jun 2017 02:42:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=be1UQMm1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753181AbdFTJm2 (ORCPT + 25 others); Tue, 20 Jun 2017 05:42:28 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:36138 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753067AbdFTJia (ORCPT ); Tue, 20 Jun 2017 05:38:30 -0400 Received: by mail-wr0-f177.google.com with SMTP id c11so32961499wrc.3 for ; Tue, 20 Jun 2017 02:38:30 -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=N5o21xjhsfYiOkiAvAc8xDLniSaY3M4Z9yubD+7kWIo=; b=be1UQMm1fIIuSiv6rU5xx2EtG+GZpvRQOZQCbdbkJ6oqyshXn0QT48qD2C8cBePi2Y hI2NykcJQmE5kuAcf0lh4RbxBkO7UUarFJ0+/K0CHWMgwBabLdAy8REb4FvqQH/C2IIZ txeuu1KoE2X+WvomhPMBIrUxy73cBKPVetGR0= 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=N5o21xjhsfYiOkiAvAc8xDLniSaY3M4Z9yubD+7kWIo=; b=RtqH5w5YCUBZDfyXT5S37sMI7AJXqAT+8kg8McmuRTzklu37xvNMwIYbNhj4lIUG6S LxE++oqBhoyBywkIWLpvs22tlIRLn6M4wNPE16MmvwsF31TgR4OfS9zHGeU/edGVBqUW PYfRVqdAH2eIXO9+7i9wuX17gfTVxBFuearn8zBvFFEqakzYWBD4XWu6PT9FMH0QeNcz 4AFD1cASFcRpBh9hqUf/pPBhgg4FyM0CFafLEfTArZZz6VNdFMg9sPHQbtvvAXk+I7tI 2OYp0oszyGtRqFpIRCbft8Z8mwQVkt6TD994aCW4LwyvJ6O8YVEfbCnupHbMY752rQce eFow== X-Gm-Message-State: AKS2vOzUY9PidKumy9HJwSlD90SCcblBG0TbaRNnU/pgxpPc4+rMV1BJ QmnSIZFc8FGuz13x X-Received: by 10.223.130.110 with SMTP id 101mr15734766wrb.21.1497951509399; Tue, 20 Jun 2017 02:38:29 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 02:38:29 -0700 (PDT) From: Benjamin Gaignard To: benjamin.gaignard@linaro.org Cc: linaro-kernel@lists.linaro.org, Maxime Ripard , Chen-Yu Tsai , Alessandro Zummo , Alexandre Belloni , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 43/51] rtc: sun6i: stop using rtc deprecated functions Date: Tue, 20 Jun 2017 11:35:51 +0200 Message-Id: <1497951359-13334-44-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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Maxime Ripard CC: Chen-Yu Tsai CC: Alessandro Zummo CC: Alexandre Belloni CC: rtc-linux@googlegroups.com CC: linux-kernel@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org --- drivers/rtc/rtc-sun6i.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 1.9.1 diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index 39cbc12..9928f74 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -120,7 +120,7 @@ struct sun6i_rtc_dev { struct device *dev; void __iomem *base; int irq; - unsigned long alarm; + unsigned long long alarm; struct clk_hw hw; struct clk_hw *int_osc; @@ -342,7 +342,7 @@ static int sun6i_rtc_getalarm(struct device *dev, struct rtc_wkalrm *wkalrm) wkalrm->enabled = !!(alrm_en & SUN6I_ALRM_EN_CNT_EN); wkalrm->pending = !!(alrm_st & SUN6I_ALRM_EN_CNT_EN); - rtc_time_to_tm(chip->alarm, &wkalrm->time); + rtc_time64_to_tm(chip->alarm, &wkalrm->time); return 0; } @@ -352,9 +352,9 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) struct sun6i_rtc_dev *chip = dev_get_drvdata(dev); struct rtc_time *alrm_tm = &wkalrm->time; struct rtc_time tm_now; - unsigned long time_now = 0; - unsigned long time_set = 0; - unsigned long time_gap = 0; + unsigned long long time_now = 0; + unsigned long long time_set = 0; + unsigned long long time_gap = 0; int ret = 0; ret = sun6i_rtc_gettime(dev, &tm_now); @@ -363,8 +363,8 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) return -EINVAL; } - rtc_tm_to_time(alrm_tm, &time_set); - rtc_tm_to_time(&tm_now, &time_now); + time_set = rtc_tm_to_time64(alrm_tm); + time_now = rtc_tm_to_time64(&tm_now); if (time_set <= time_now) { dev_err(dev, "Date to set in the past\n"); return -EINVAL;