[RFC PATCH v2 06/10] lib: vdso: make do_coarse() return 0

[Christophe Leroy]

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

Change its type to int instead of void and get it return 0
at all time. This cleans the code a bit.

Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>
---
 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 86d5b1c8796b..17b4cff6e5f0 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -64,7 +64,7 @@ static inline 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];
@@ -75,6 +75,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
@@ -92,14 +94,13 @@ __cvdso_clock_gettime(const struct vdso_data *vd, clockid_t 
clock,
         * 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.13.3