staging: android-alarm: Fixup minor pr_alarm warnings
authorJohn Stultz <john.stultz@linaro.org>
Thu, 9 Feb 2012 22:24:40 +0000 (14:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:08:01 +0000 (10:08 -0800)
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: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/alarm.c

index 642a22f01c1bad00b258b9332d4a3ef24895ea29..c68950b9e08f805316edb1d486b6f24f6c08e500 100644 (file)
@@ -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;