lkml.org 
[lkml]   [2022]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 72/77] lib/vdso: Let do_coarse() return 0 to simplify the callsite
    Date
    From: Christophe Leroy <christophe.leroy@c-s.fr>

    [ Upstream commit 8463cf80529d0fd80b84cd5ab8b9b952b01c7eb9 ]

    do_coarse() is similar to do_hres() except that it never fails.

    Change its type to int instead of void and let it always return success (0)
    to simplify the call site.

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Link: https://lore.kernel.org/r/21e8afa38c02ca8672c2690307383507fe63b454.1577111367.git.christophe.leroy@c-s.fr
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    lib/vdso/gettimeofday.c | 15 ++++++++-------
    1 file changed, 8 insertions(+), 7 deletions(-)

    diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
    index 45f57fd2db649..c549e72758aa0 100644
    --- a/lib/vdso/gettimeofday.c
    +++ b/lib/vdso/gettimeofday.c
    @@ -68,7 +68,7 @@ static int do_hres(const struct vdso_data *vd, clockid_t clk,
    return 0;
    }

    -static void do_coarse(const struct vdso_data *vd, clockid_t clk,
    +static int do_coarse(const struct vdso_data *vd, clockid_t clk,
    struct __kernel_timespec *ts)
    {
    const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
    @@ -79,6 +79,8 @@ static void do_coarse(const struct vdso_data *vd, clockid_t clk,
    ts->tv_sec = vdso_ts->sec;
    ts->tv_nsec = vdso_ts->nsec;
    } while (unlikely(vdso_read_retry(vd, seq)));
    +
    + return 0;
    }

    static __maybe_unused int
    @@ -96,14 +98,13 @@ __cvdso_clock_gettime_common(clockid_t clock, struct __kernel_timespec *ts)
    * clocks are handled in the VDSO directly.
    */
    msk = 1U << clock;
    - if (likely(msk & VDSO_HRES)) {
    + if (likely(msk & VDSO_HRES))
    return do_hres(&vd[CS_HRES_COARSE], clock, ts);
    - } else if (msk & VDSO_COARSE) {
    - do_coarse(&vd[CS_HRES_COARSE], clock, ts);
    - return 0;
    - } else if (msk & VDSO_RAW) {
    + else if (msk & VDSO_COARSE)
    + return do_coarse(&vd[CS_HRES_COARSE], clock, ts);
    + else if (msk & VDSO_RAW)
    return do_hres(&vd[CS_RAW], clock, ts);
    - }
    +
    return -1;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-02 14:54    [W:4.485 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site