diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-02-09 22:24:40 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 18:08:01 (GMT) |
| commit | 7f9b98a39bdd12db051514eb0daff689c34b8b4e (patch) | |
| tree | 9cce1450ce2fef637327aec05d5a6926a7816836 /drivers/staging/android | |
| parent | f2d3c6898abd6c5d69e6d1504413434df1ea2538 (diff) | |
| download | linux-fsl-qoriq-7f9b98a39bdd12db051514eb0daff689c34b8b4e.tar.xz | |
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: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/alarm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 642a22f..c68950b 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; |