diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2012-04-16 21:01:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 19:49:00 -0400 |
commit | 15ecf29e1666ac0c18625ad276423c0291536543 (patch) | |
tree | 29551c3e750243280e4041b4a5f21b21da7309f4 | |
parent | ad220db422c778a30f83061e9e2458b5f0ee6704 (diff) |
staging: fix android alarm.c printk format warnings
Fix printk format warnings by using 't' modifier for ptrdiff_t.
drivers/staging/android/alarm.c:344:2: warning: format '%ld' expects type 'long int', but argument 2 has type 'int'
drivers/staging/android/alarm.c:367:3: warning: format '%ld' expects type 'long int', but argument 2 has type 'int'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 d42a592927e..0cae132fbfd 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) | |||
341 | now = base->stopped ? base->stopped_time : hrtimer_cb_get_time(timer); | 341 | now = base->stopped ? base->stopped_time : hrtimer_cb_get_time(timer); |
342 | now = ktime_sub(now, base->delta); | 342 | now = ktime_sub(now, base->delta); |
343 | 343 | ||
344 | pr_alarm(INT, "alarm_timer_triggered type %ld at %lld\n", | 344 | pr_alarm(INT, "alarm_timer_triggered type %td at %lld\n", |
345 | base - alarms, ktime_to_ns(now)); | 345 | base - alarms, ktime_to_ns(now)); |
346 | 346 | ||
347 | while (base->first) { | 347 | while (base->first) { |
@@ -364,7 +364,7 @@ static enum hrtimer_restart alarm_timer_triggered(struct hrtimer *timer) | |||
364 | spin_lock_irqsave(&alarm_slock, flags); | 364 | spin_lock_irqsave(&alarm_slock, flags); |
365 | } | 365 | } |
366 | if (!base->first) | 366 | if (!base->first) |
367 | pr_alarm(FLOW, "no more alarms of type %ld\n", base - alarms); | 367 | pr_alarm(FLOW, "no more alarms of type %td\n", base - alarms); |
368 | update_timer_locked(base, true); | 368 | update_timer_locked(base, true); |
369 | spin_unlock_irqrestore(&alarm_slock, flags); | 369 | spin_unlock_irqrestore(&alarm_slock, flags); |
370 | return HRTIMER_NORESTART; | 370 | return HRTIMER_NORESTART; |