From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751618AbdHaMXi (ORCPT ); Thu, 31 Aug 2017 08:23:38 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:60524 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751488AbdHaMXg (ORCPT ); Thu, 31 Aug 2017 08:23:36 -0400 Message-Id: <20170831105825.886686526@linutronix.de> User-Agent: quilt/0.63-1 Date: Thu, 31 Aug 2017 12:23:35 -0000 From: Anna-Maria Gleixner To: LKML Cc: Peter Zijlstra , Ingo Molnar , Christoph Hellwig , keescook@chromium.org, John Stultz , Thomas Gleixner Subject: [PATCH 04/25] hrtimer: Cleanup clock argument in schedule_hrtimeout_range_clock() References: <20170831105725.809317030@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=hrtimer_Cleanup_clock_argument_in_schedule_hrtimeout_range_clock().patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anna-Maria Gleixner schedule_hrtimeout_range_clock() uses an integer for the clock id instead of the predefined type "clockid_t". The ID of the clock is indicated in hrtimer code as clock_id. Therefore change the name of the variable as well to make it consistent. While at it, clean up the description for the function parameters clock_id and mode. The clock modes and the clock ids are not restricted as the comment suggests. No functional change. Signed-off-by: Anna-Maria Gleixner --- include/linux/hrtimer.h | 2 +- kernel/time/hrtimer.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -466,7 +466,7 @@ extern int schedule_hrtimeout_range(ktim extern int schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta, const enum hrtimer_mode mode, - int clock); + clockid_t clock_id); extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode); /* Soft interrupt function to run the hrtimer queues: */ --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1671,12 +1671,12 @@ void __init hrtimers_init(void) * schedule_hrtimeout_range_clock - sleep until timeout * @expires: timeout value (ktime_t) * @delta: slack in expires timeout (ktime_t) - * @mode: timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL - * @clock: timer clock, CLOCK_MONOTONIC or CLOCK_REALTIME + * @mode: timer mode + * @clock_id: timer clock to be used */ int __sched schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta, - const enum hrtimer_mode mode, int clock) + const enum hrtimer_mode mode, clockid_t clock_id) { struct hrtimer_sleeper t; @@ -1697,7 +1697,7 @@ schedule_hrtimeout_range_clock(ktime_t * return -EINTR; } - hrtimer_init_on_stack(&t.timer, clock, mode); + hrtimer_init_on_stack(&t.timer, clock_id, mode); hrtimer_set_expires_range_ns(&t.timer, *expires, delta); hrtimer_init_sleeper(&t, current);