From: John Stultz Date: Thu, 9 Feb 2012 22:24:40 +0000 (-0800) Subject: staging: android-alarm: Fixup minor pr_alarm warnings X-Git-Tag: MMI-PSA29.97-13-9~17268^2~176^2~7 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f9b98a39bdd12db051514eb0daff689c34b8b4e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 CC: Android Kernel Team Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 642a22f01c1b..c68950b9e08f 100644 --- a/drivers/staging/android/alarm.c +++ b/drivers/staging/android/alarm.c @@ -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;