Skip to content

Commit b96ce49

Browse files
committed
posix-timers: Polish coding style in a few places
Make it consistent with the TIP tree documentation. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <frederic@kernel.org> Link: https://lore.kernel.org/r/20230425183313.888493625@linutronix.de
1 parent 200dbd6 commit b96ce49

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

kernel/time/posix-timers.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
309309
*/
310310
static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
311311
{
312+
enum hrtimer_restart ret = HRTIMER_NORESTART;
312313
struct k_itimer *timr;
313314
unsigned long flags;
314315
int si_private = 0;
315-
enum hrtimer_restart ret = HRTIMER_NORESTART;
316316

317317
timr = container_of(timer, struct k_itimer, it.real.timer);
318318
spin_lock_irqsave(&timr->it_lock, flags);
@@ -400,8 +400,8 @@ static struct pid *good_sigevent(sigevent_t * event)
400400

401401
static struct k_itimer * alloc_posix_timer(void)
402402
{
403-
struct k_itimer *tmr;
404-
tmr = kmem_cache_zalloc(posix_timers_cache, GFP_KERNEL);
403+
struct k_itimer *tmr = kmem_cache_zalloc(posix_timers_cache, GFP_KERNEL);
404+
405405
if (!tmr)
406406
return tmr;
407407
if (unlikely(!(tmr->sigq = sigqueue_alloc()))) {
@@ -695,8 +695,8 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)
695695

696696
static int do_timer_gettime(timer_t timer_id, struct itimerspec64 *setting)
697697
{
698-
struct k_itimer *timr;
699698
const struct k_clock *kc;
699+
struct k_itimer *timr;
700700
unsigned long flags;
701701
int ret = 0;
702702

@@ -767,8 +767,8 @@ SYSCALL_DEFINE2(timer_gettime32, timer_t, timer_id,
767767
SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)
768768
{
769769
struct k_itimer *timr;
770-
int overrun;
771770
unsigned long flags;
771+
int overrun;
772772

773773
timr = lock_timer(timer_id, &flags);
774774
if (!timr)
@@ -941,8 +941,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
941941
const struct __kernel_itimerspec __user *, new_setting,
942942
struct __kernel_itimerspec __user *, old_setting)
943943
{
944-
struct itimerspec64 new_spec, old_spec;
945-
struct itimerspec64 *rtn = old_setting ? &old_spec : NULL;
944+
struct itimerspec64 new_spec, old_spec, *rtn;
946945
int error = 0;
947946

948947
if (!new_setting)
@@ -951,6 +950,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
951950
if (get_itimerspec64(&new_spec, new_setting))
952951
return -EFAULT;
953952

953+
rtn = old_setting ? &old_spec : NULL;
954954
error = do_timer_settime(timer_id, flags, &new_spec, rtn);
955955
if (!error && old_setting) {
956956
if (put_itimerspec64(&old_spec, old_setting))

0 commit comments

Comments
 (0)