lkml.org 
[lkml]   [2017]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 50/51] rtc: xgene stop using rtc deprecated functions
    Date
    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.

    For the same reasons use set_mmss64 callback instead of set_mmss

    Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
    CC: Alessandro Zummo <a.zummo@towertech.it>
    CC: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    CC: rtc-linux@googlegroups.com
    CC: linux-kernel@vger.kernel.org
    ---
    drivers/rtc/rtc-xgene.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/rtc/rtc-xgene.c b/drivers/rtc/rtc-xgene.c
    index 65b432a..c62b5b6 100644
    --- a/drivers/rtc/rtc-xgene.c
    +++ b/drivers/rtc/rtc-xgene.c
    @@ -58,11 +58,11 @@ static int xgene_rtc_read_time(struct device *dev, struct rtc_time *tm)
    {
    struct xgene_rtc_dev *pdata = dev_get_drvdata(dev);

    - rtc_time_to_tm(readl(pdata->csr_base + RTC_CCVR), tm);
    + rtc_time64_to_tm(readl(pdata->csr_base + RTC_CCVR), tm);
    return rtc_valid_tm(tm);
    }

    -static int xgene_rtc_set_mmss(struct device *dev, unsigned long secs)
    +static int xgene_rtc_set_mmss64(struct device *dev, time64_t secs)
    {
    struct xgene_rtc_dev *pdata = dev_get_drvdata(dev);

    @@ -80,7 +80,7 @@ static int xgene_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
    {
    struct xgene_rtc_dev *pdata = dev_get_drvdata(dev);

    - rtc_time_to_tm(pdata->alarm_time, &alrm->time);
    + rtc_time64_to_tm(pdata->alarm_time, &alrm->time);
    alrm->enabled = readl(pdata->csr_base + RTC_CCR) & RTC_CCR_IE;

    return 0;
    @@ -108,10 +108,10 @@ static int xgene_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
    {
    struct xgene_rtc_dev *pdata = dev_get_drvdata(dev);
    unsigned long rtc_time;
    - unsigned long alarm_time;
    + unsigned long long alarm_time;

    rtc_time = readl(pdata->csr_base + RTC_CCVR);
    - rtc_tm_to_time(&alrm->time, &alarm_time);
    + alarm_time = rtc_tm_to_time64(&alrm->time);

    pdata->alarm_time = alarm_time;
    writel((u32) pdata->alarm_time, pdata->csr_base + RTC_CMR);
    @@ -123,7 +123,7 @@ static int xgene_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)

    static const struct rtc_class_ops xgene_rtc_ops = {
    .read_time = xgene_rtc_read_time,
    - .set_mmss = xgene_rtc_set_mmss,
    + .set_mmss64 = xgene_rtc_set_mmss64,
    .read_alarm = xgene_rtc_read_alarm,
    .set_alarm = xgene_rtc_set_alarm,
    .alarm_irq_enable = xgene_rtc_alarm_irq_enable,
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-06-20 11:41    [W:4.146 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site