[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4F8CC0E4.5030706@xenotime.net>
Date: Mon, 16 Apr 2012 18:01:24 -0700
From: Randy Dunlap <rdunlap@...otime.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Greg KH <greg@...ah.com>, Brian Swetland <swetland@...gle.com>,
Andrew Morton <akpm@...ux-foundation.org>,
devel@...verdev.osuosl.org
Subject: [PATCH -next] staging: fix android alarm.c printk format warnings
From: Randy Dunlap <rdunlap@...otime.net>
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@...otime.net>
Cc: Greg KH <greg@...ah.com>
Cc: Brian Swetland <swetland@...gle.com>
---
drivers/staging/android/alarm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20120416.orig/drivers/staging/android/alarm.c
+++ linux-next-20120416/drivers/staging/android/alarm.c
@@ -341,7 +341,7 @@ static enum hrtimer_restart alarm_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_
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists