[patch 04/11] posix-timers: Remove pointless unlock_timer() wrapper

[Thomas Gleixner <tglx@linutronix.de>]

It's just a wrapper around spin_unlock_irqrestore() with zero value.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/time/posix-timers.c |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -144,11 +144,6 @@ static int posix_timer_add(struct k_itim
 	return -EAGAIN;
 }
 
-static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
-{
-	spin_unlock_irqrestore(&timr->it_lock, flags);
-}
-
 static int posix_get_realtime_timespec(clockid_t which_clock, struct timespec64 *tp)
 {
 	ktime_get_real_ts64(tp);
@@ -691,7 +686,7 @@ static int do_timer_gettime(timer_t time
 	else
 		kc->timer_get(timr, setting);
 
-	unlock_timer(timr, flags);
+	spin_unlock_irqrestore(&timr->it_lock, flags);
 	return ret;
 }
 
@@ -755,7 +750,7 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_
 		return -EINVAL;
 
 	overrun = timer_overrun_to_int(timr);
-	unlock_timer(timr, flags);
+	spin_unlock_irqrestore(&timr->it_lock, flags);
 
 	return overrun;
 }
@@ -822,7 +817,7 @@ static struct k_itimer *timer_wait_runni
 
 	/* Prevent kfree(timer) after dropping the lock */
 	rcu_read_lock();
-	unlock_timer(timer, *flags);
+	spin_unlock_irqrestore(&timer->it_lock, *flags);
 
 	/*
 	 * kc->timer_wait_running() might drop RCU lock. So @timer
@@ -928,7 +923,7 @@ static int do_timer_settime(timer_t time
 		timr = timer_wait_running(timr, &flags);
 		goto retry;
 	}
-	unlock_timer(timr, flags);
+	spin_unlock_irqrestore(&timr->it_lock, flags);
 
 	return error;
 }
@@ -1046,7 +1041,7 @@ SYSCALL_DEFINE1(timer_delete, timer_t, t
 	WRITE_ONCE(timer->it_signal, NULL);
 	spin_unlock(&current->sighand->siglock);
 
-	unlock_timer(timer, flags);
+	spin_unlock_irqrestore(&timer->it_lock, flags);
 	posix_timer_unhash_and_free(timer);
 	return 0;
 }