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 27/51] rtc: imxdi: 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-imxdi.c | 16 +++++++---------
    1 file changed, 7 insertions(+), 9 deletions(-)

    diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
    index 6b54f6c..9af601d 100644
    --- a/drivers/rtc/rtc-imxdi.c
    +++ b/drivers/rtc/rtc-imxdi.c
    @@ -549,10 +549,10 @@ static int di_write_wait(struct imxdi_dev *imxdi, u32 val, int reg)
    static int dryice_rtc_read_time(struct device *dev, struct rtc_time *tm)
    {
    struct imxdi_dev *imxdi = dev_get_drvdata(dev);
    - unsigned long now;
    + unsigned long long now;

    now = readl(imxdi->ioaddr + DTCMR);
    - rtc_time_to_tm(now, tm);
    + rtc_time64_to_tm(now, tm);

    return 0;
    }
    @@ -561,7 +561,7 @@ static int dryice_rtc_read_time(struct device *dev, struct rtc_time *tm)
    * set the seconds portion of dryice time counter and clear the
    * fractional part.
    */
    -static int dryice_rtc_set_mmss(struct device *dev, unsigned long secs)
    +static int dryice_rtc_set_mmss64(struct device *dev, time64_t secs)
    {
    struct imxdi_dev *imxdi = dev_get_drvdata(dev);
    u32 dcr, dsr;
    @@ -618,7 +618,7 @@ static int dryice_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
    u32 dcamr;

    dcamr = readl(imxdi->ioaddr + DCAMR);
    - rtc_time_to_tm(dcamr, &alarm->time);
    + rtc_time64_to_tm((u64)dcamr, &alarm->time);

    /* alarm is enabled if the interrupt is enabled */
    alarm->enabled = (readl(imxdi->ioaddr + DIER) & DIER_CAIE) != 0;
    @@ -641,12 +641,10 @@ static int dryice_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
    {
    struct imxdi_dev *imxdi = dev_get_drvdata(dev);
    unsigned long now;
    - unsigned long alarm_time;
    + unsigned long long alarm_time;
    int rc;

    - rc = rtc_tm_to_time(&alarm->time, &alarm_time);
    - if (rc)
    - return rc;
    + alarm_time = rtc_tm_to_time64(&alarm->time);

    /* don't allow setting alarm in the past */
    now = readl(imxdi->ioaddr + DTCMR);
    @@ -668,7 +666,7 @@ static int dryice_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)

    static const struct rtc_class_ops dryice_rtc_ops = {
    .read_time = dryice_rtc_read_time,
    - .set_mmss = dryice_rtc_set_mmss,
    + .set_mmss64 = dryice_rtc_set_mmss64,
    .alarm_irq_enable = dryice_rtc_alarm_irq_enable,
    .read_alarm = dryice_rtc_read_alarm,
    .set_alarm = dryice_rtc_set_alarm,
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-06-20 11:48    [W:6.312 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site