]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
staging: fix android alarm.c printk format warnings
authorRandy Dunlap <rdunlap@xenotime.net>
Tue, 17 Apr 2012 01:01:24 +0000 (18:01 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Apr 2012 23:49:00 +0000 (16:49 -0700)
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>
drivers/staging/android/alarm.c

index d42a592927ea1982328155dfa222a3f27247f929..0cae132fbfd7ba88da518ed4afb776500f5ee2dc 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 %ld at %lld\n",
+       pr_alarm(INT, "alarm_timer_triggered type %td 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 %ld\n", base - alarms);
+               pr_alarm(FLOW, "no more alarms of type %td\n", base - alarms);
        update_timer_locked(base, true);
        spin_unlock_irqrestore(&alarm_slock, flags);
        return HRTIMER_NORESTART;