Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f9b98a3 authored by John Stultz's avatar John Stultz Committed by Greg Kroah-Hartman
Browse files

staging: android-alarm: Fixup minor pr_alarm warnings 



This patch fixes the following warnings:

drivers/staging/android/alarm.c: In function ‘alarm_timer_triggered’:
drivers/staging/android/alarm.c:344: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘long int’
drivers/staging/android/alarm.c:367: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘long int’

CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2d3c689

drivers/staging/android/alarm.c

+2 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer) 
	now = base->stopped ? base->stopped_time : hrtimer_cb_get_time(timer);

	now = ktime_sub(now, base->delta);



	pr_alarm(INT, "alarm_timer_triggered type %d at %lld\n",

	pr_alarm(INT, "alarm_timer_triggered type %ld at %lld\n",

		base - alarms, ktime_to_ns(now));



	while (base->first) {
@@ -364,7 +364,7 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer) 
		spin_lock_irqsave(&alarm_slock, flags);

	}

	if (!base->first)

		pr_alarm(FLOW, "no more alarms of type %d\n", base - alarms);

		pr_alarm(FLOW, "no more alarms of type %ld\n", base - alarms);

	update_timer_locked(base, true);

	spin_unlock_irqrestore(&alarm_slock, flags);

	return HRTIMER_NORESTART;