From patchwork Tue Jun 20 09:35:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 105973 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1277678qgd; Tue, 20 Jun 2017 02:46:58 -0700 (PDT) X-Received: by 10.99.65.7 with SMTP id o7mr31415537pga.90.1497952018706; Tue, 20 Jun 2017 02:46:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497952018; cv=none; d=google.com; s=arc-20160816; b=xlX8Y20La2lSxA2vSdnnQx1smW4P0LZ6EGqdN0b8ESnjMI5wnWf6ZLw1m6sWTdNaWK M4mnK9EoLnWkifmhzS75CKm/xBi/k+mqjERNIL2czMHH2h9edOl+rHsJsj4tTJRpy3gt lkb8SCwggxnftA0tZsXVgWz+M14Gz/t2tIuSh0FUaMgq9W1h1ZAUeawyrhgPqaxkj6QP tyzPpFz+rYMyxQxZsZLpd3PD2WCDB2D7PJFW0PSGDO2iSgMwo3kWLGaG5tqc2ST2EUIH hylwTmkOw/BfBAC0SAGiv56zhHSUvpyk6zxl3AauWkfHewyKRSmrnqh9YE4nBvJSHupr Ui5g== 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=eQfzzkUh85U+thCoxQ8/ndRxErzn4reA4Xn1JugVeyE=; b=peTELv3WiLYpPhu9mE971ByP7Ivaf6/8eLaS2xs2cH4qEA8RtMFo0nU93J88dm81I3 wq9xErtMZRb44j+y7rP66YAKhZjECBYByY3pW6aYawwD6Vx28gDTU4P0Q2xozn6xSsFx PqR8ifUyJxzHH/7HoXovkQ9y51jmkvjjX2rn2ejacoepzp2RodykPaQBQ3qQzcZexuMI yzV8WScZ5kjEXiXeziDTAMXMog5Tf8CyuHOr0CJFWLVatoL8QfrOLID9P+AwJMSminVY Cht3Qu9gNa+rIVk5fSGphUpfOAoDBl7PZld1x+UoskfCUvA5wZ1bLdS3GaUj9EkjFOE5 JYBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=Gzceptqw; 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 66si7923619pfn.127.2017.06.20.02.46.58; Tue, 20 Jun 2017 02:46:58 -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=Gzceptqw; 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 S1753143AbdFTJqt (ORCPT + 25 others); Tue, 20 Jun 2017 05:46:49 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:36036 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752988AbdFTJiS (ORCPT ); Tue, 20 Jun 2017 05:38:18 -0400 Received: by mail-wr0-f172.google.com with SMTP id c11so32957247wrc.3 for ; Tue, 20 Jun 2017 02:38:18 -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=eQfzzkUh85U+thCoxQ8/ndRxErzn4reA4Xn1JugVeyE=; b=Gzceptqw4m77xvD/Et3j85FpmyqMMphW+6ivAq1rpHJrGaDGJKlv85AniznvGCTFlZ cjcciwERBSmKkm2G3c0LVXdsT7Xiw29qBBaOCUTWUohn9D2+HYq7pXD94nVEPvr5Lus8 nwJrmp51CXCEvQndp0AtRNSSqhXpQN/Pq9d0c= 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=eQfzzkUh85U+thCoxQ8/ndRxErzn4reA4Xn1JugVeyE=; b=WmYN13nYPllxZ95zted/3IWTX+XC4KcK0ze+vu/hzD06ZZfOYqzEwVhTaICYAWMZZ6 db/oGp+DZfX/8K8SzIoVdV6MWmO0LxY12kiCu5dpHUatZsZnmD7T8kqPc8EFY57zF4DP OkSspYyhVEAjJV8Qdgmg1wEoaWUhVbgtjTdn3Mq8QMTwcj/hVXQR53GsLdqS5wT0xMfr V32TleNvLGkdVhYFiqlaaxvx+YjpbMAC4BOrAgylsUIG8U/97X3lXKSoH8BVOPcJqB/o U+HUlMMKNTaT53t9YPasXzNO1fw3YVYssWa/N9L8Fsuxe4JBEe+iJf6JRD12sg9KQUBo uY1A== X-Gm-Message-State: AKS2vOwueQBcbbIIiLGJ6AwjQ386QRcrTD9GbScEmtMTDGoxCqXUA25F cBCltzFBDBqu/tWM X-Received: by 10.223.133.167 with SMTP id 36mr20084193wrt.86.1497951492626; Tue, 20 Jun 2017 02:38:12 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 02:38:12 -0700 (PDT) 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 33/51] rtc: pl030: stop using rtc deprecated functions Date: Tue, 20 Jun 2017 11:35:41 +0200 Message-Id: <1497951359-13334-34-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: Alessandro Zummo CC: Alexandre Belloni CC: rtc-linux@googlegroups.com CC: linux-kernel@vger.kernel.org --- drivers/rtc/rtc-pl030.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 1.9.1 diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index f85a1a9..c917051 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c @@ -39,24 +39,26 @@ static int pl030_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - rtc_time_to_tm(readl(rtc->base + RTC_MR), &alrm->time); + rtc_time64_to_tm(readl(rtc->base + RTC_MR), &alrm->time); return 0; } static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - unsigned long time; + unsigned long long time; int ret; /* * At the moment, we can only deal with non-wildcarded alarm times. */ ret = rtc_valid_tm(&alrm->time); - if (ret == 0) - ret = rtc_tm_to_time(&alrm->time, &time); - if (ret == 0) - writel(time, rtc->base + RTC_MR); + if (ret) + return ret; + + time = rtc_tm_to_time64(&alrm->time); + writel(time, rtc->base + RTC_MR); + return ret; } @@ -64,7 +66,7 @@ static int pl030_read_time(struct device *dev, struct rtc_time *tm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); - rtc_time_to_tm(readl(rtc->base + RTC_DR), tm); + rtc_time64_to_tm(readl(rtc->base + RTC_DR), tm); return 0; } @@ -81,13 +83,11 @@ static int pl030_set_time(struct device *dev, struct rtc_time *tm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); unsigned long time; - int ret; - ret = rtc_tm_to_time(tm, &time); - if (ret == 0) - writel(time + 1, rtc->base + RTC_LR); + time = rtc_tm_to_time64(tm); + writel(time + 1, rtc->base + RTC_LR); - return ret; + return 0; } static const struct rtc_class_ops pl030_ops = {