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 13/51] rtc: cpcap: 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.

    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-cpcap.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/rtc/rtc-cpcap.c b/drivers/rtc/rtc-cpcap.c
    index 3a0333e..059aa18 100644
    --- a/drivers/rtc/rtc-cpcap.c
    +++ b/drivers/rtc/rtc-cpcap.c
    @@ -58,19 +58,19 @@ struct cpcap_rtc {
    static void cpcap2rtc_time(struct rtc_time *rtc, struct cpcap_time *cpcap)
    {
    unsigned long int tod;
    - unsigned long int time;
    + unsigned long long time;

    tod = (cpcap->tod1 & TOD1_MASK) | ((cpcap->tod2 & TOD2_MASK) << 8);
    time = tod + ((cpcap->day & DAY_MASK) * SECS_PER_DAY);

    - rtc_time_to_tm(time, rtc);
    + rtc_time64_to_tm(time, rtc);
    }

    static void rtc2cpcap_time(struct cpcap_time *cpcap, struct rtc_time *rtc)
    {
    - unsigned long time;
    + unsigned long long time;

    - rtc_tm_to_time(rtc, &time);
    + time = rtc_tm_to_time64(rtc);

    cpcap->day = time / SECS_PER_DAY;
    time %= SECS_PER_DAY;
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-06-20 11:57    [W:4.298 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site