From patchwork Wed Jul 12 08:04:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 107458 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp602189obm; Wed, 12 Jul 2017 01:06:55 -0700 (PDT) X-Received: by 10.84.217.217 with SMTP id d25mr2782444plj.145.1499846815903; Wed, 12 Jul 2017 01:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499846815; cv=none; d=google.com; s=arc-20160816; b=tKF4kRp0EHpfuN4DMUbtRjB2uf3b+R9ekG6/utVgj68paSUWb/rLjv3ItmEgIjWXCK n0jwwIc/XfRurXuJLPUpsBds2Kdez8LLaGIRts9DGR4xAzLYqKN8QRCmenRgUOIuyMVx WUDtEa7nRV1dxTlCHUBxo+OvcSmkcS+mXuFivu1bi+b9TcZdLtz+D2NdUOlF0PQHu3DG E4/MC/cKSCPAmycJVSNYmnmFmILxaxpbRKy7HEB5AHv/GFIoKyFBCLnKJLhXpZ5cWU1C aKdg43d/bjaH2XxNfFretCxvCNSxfXNJy+J3klXEtDLcjs9mGQcQevaV13UlUwIo7m3s UvnQ== 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=IvbRe/8j5g3ZGOiXqYPaEeDu9ER758SwL0e336h0ewezfhIACG9yDv/a9hwfQaWe2i 15y6HFpgX8TLqGY8oZfInRYTVcV3sLH5h4aixTbrW3YxltEFgouiMPIc1Y9anKFVIc/x 7m2O0Njz0dftYwA/STyGSYu/L1thXJY9PoLQzjM7zlt/+gG85t9F49cO+DKAeAfikA28 UZzXlEQpWuUW+kmCDZuCcIEjSF3QMwcyuKhtm/ECpKQFI9rPjHRtwZCEcRZlH4t1iG5k oBdxShEeTfaMA4a5z4i+Ix6PY8A74iZl326OoOKxyHCXU1DMFez3oht+M6evLh6UQxhc Byng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=AKvhkiyA; 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 79si1468065pgf.431.2017.07.12.01.06.55; Wed, 12 Jul 2017 01:06:55 -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=AKvhkiyA; 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 S1757186AbdGLIGw (ORCPT + 25 others); Wed, 12 Jul 2017 04:06:52 -0400 Received: from mail-wr0-f175.google.com ([209.85.128.175]:33181 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757105AbdGLIFw (ORCPT ); Wed, 12 Jul 2017 04:05:52 -0400 Received: by mail-wr0-f175.google.com with SMTP id r103so22517760wrb.0 for ; Wed, 12 Jul 2017 01:05:47 -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=AKvhkiyAVxHnk5dXCEV/gD9uZJ62hwSILkoG8fCyOd2TRzhXpK7jxvP67gwpDMH6jZ RnHnD1U9vmr61JGuK52jL0bBwbfuFJPD4SB1j3Wi6dhd1BlSkssaBxJtqCmGo9UPTx2/ WwOF7PWPVuM0VgPdHTFODHqdW2/PbQKMXfXF4= 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=DG02Xv4xiKEtER/i7w53KU/NsnmF+/4y+jZ6/NEr2Ar/zGGJ+n9+57Gh7TQERmrbHS qLYABUZzdcDNvnz1y5/DwkugMHQLvsQwJPJQ80UCjISutDEWG1H9Xnt05dfzljTpn+8Q dxnXTYQjRGqJ7FQtT35RAJT+57Ek9HjF06boikp3zi/g/RE1j4jfuTElrwnRiV/clR63 t8yzUIE12WcsPDqW17zhf3OmLtm37tJ4cO7uq2ZoJQ7QN4Amy/dKfG/GZkAA33U801UJ qEcP04h5L/Ji+X1FuV9CrB+tcw1Mnk2ffQ/ja/rLPHr4kRIu7dvdgQw1LfYxv0QZABJf A1PQ== X-Gm-Message-State: AIVw11178FAq274gW2Fe264V+BpkzKvHqGEqTxLSjTn3h4ojoAcYk5il 4vugJ3+hAbHiyBh2 X-Received: by 10.28.175.135 with SMTP id y129mr1549411wme.87.1499846741458; Wed, 12 Jul 2017 01:05:41 -0700 (PDT) Received: from lmenx321.st.com. ([80.215.158.26]) by smtp.gmail.com with ESMTPSA id p34sm1430744wrc.66.2017.07.12.01.05.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jul 2017 01:05:40 -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 v2 19/22] rtc: sun6i: stop using rtc deprecated functions Date: Wed, 12 Jul 2017 10:04:39 +0200 Message-Id: <1499846682-14093-20-git-send-email-benjamin.gaignard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499846682-14093-1-git-send-email-benjamin.gaignard@linaro.org> References: <1499846682-14093-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;