lib/vdso: Let do_coarse() return 0 to simplify the callsite (8463cf80) · Commits · 戴 / test

lib/vdso/gettimeofday.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}