diff options
author | Steven Rostedt <srostedt@redhat.com> | 2009-01-15 21:00:50 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 06:17:38 -0500 |
commit | 5e4abc9839191e213965e0f1dbf36e2e44356c3a (patch) | |
tree | f2dee1eed74ef80778dc098114092baf0229e2ac /kernel/trace/trace_mmiotrace.c | |
parent | c37abc5515b5ed5b1d2134d2deaead492d9f92a2 (diff) |
trace: clean up format errors in calls to trace_seq_printf
After adding the printf format checking for trace_seq_printf, several
warnings now show up. This patch cleans them up.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_mmiotrace.c')
-rw-r--r-- | kernel/trace/trace_mmiotrace.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c index 621c8c3f3139..ec78e244242e 100644 --- a/kernel/trace/trace_mmiotrace.c +++ b/kernel/trace/trace_mmiotrace.c | |||
@@ -184,21 +184,22 @@ static enum print_line_t mmio_print_rw(struct trace_iterator *iter) | |||
184 | switch (rw->opcode) { | 184 | switch (rw->opcode) { |
185 | case MMIO_READ: | 185 | case MMIO_READ: |
186 | ret = trace_seq_printf(s, | 186 | ret = trace_seq_printf(s, |
187 | "R %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", | 187 | "R %d %u.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", |
188 | rw->width, secs, usec_rem, rw->map_id, | 188 | rw->width, secs, usec_rem, rw->map_id, |
189 | (unsigned long long)rw->phys, | 189 | (unsigned long long)rw->phys, |
190 | rw->value, rw->pc, 0); | 190 | rw->value, rw->pc, 0); |
191 | break; | 191 | break; |
192 | case MMIO_WRITE: | 192 | case MMIO_WRITE: |
193 | ret = trace_seq_printf(s, | 193 | ret = trace_seq_printf(s, |
194 | "W %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", | 194 | "W %d %u.%06lu %d 0x%llx 0x%lx 0x%lx %d\n", |
195 | rw->width, secs, usec_rem, rw->map_id, | 195 | rw->width, secs, usec_rem, rw->map_id, |
196 | (unsigned long long)rw->phys, | 196 | (unsigned long long)rw->phys, |
197 | rw->value, rw->pc, 0); | 197 | rw->value, rw->pc, 0); |
198 | break; | 198 | break; |
199 | case MMIO_UNKNOWN_OP: | 199 | case MMIO_UNKNOWN_OP: |
200 | ret = trace_seq_printf(s, | 200 | ret = trace_seq_printf(s, |
201 | "UNKNOWN %lu.%06lu %d 0x%llx %02x,%02x,%02x 0x%lx %d\n", | 201 | "UNKNOWN %u.%06lu %d 0x%llx %02lx,%02lx," |
202 | "%02lx 0x%lx %d\n", | ||
202 | secs, usec_rem, rw->map_id, | 203 | secs, usec_rem, rw->map_id, |
203 | (unsigned long long)rw->phys, | 204 | (unsigned long long)rw->phys, |
204 | (rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff, | 205 | (rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff, |
@@ -230,14 +231,14 @@ static enum print_line_t mmio_print_map(struct trace_iterator *iter) | |||
230 | switch (m->opcode) { | 231 | switch (m->opcode) { |
231 | case MMIO_PROBE: | 232 | case MMIO_PROBE: |
232 | ret = trace_seq_printf(s, | 233 | ret = trace_seq_printf(s, |
233 | "MAP %lu.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n", | 234 | "MAP %u.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n", |
234 | secs, usec_rem, m->map_id, | 235 | secs, usec_rem, m->map_id, |
235 | (unsigned long long)m->phys, m->virt, m->len, | 236 | (unsigned long long)m->phys, m->virt, m->len, |
236 | 0UL, 0); | 237 | 0UL, 0); |
237 | break; | 238 | break; |
238 | case MMIO_UNPROBE: | 239 | case MMIO_UNPROBE: |
239 | ret = trace_seq_printf(s, | 240 | ret = trace_seq_printf(s, |
240 | "UNMAP %lu.%06lu %d 0x%lx %d\n", | 241 | "UNMAP %u.%06lu %d 0x%lx %d\n", |
241 | secs, usec_rem, m->map_id, 0UL, 0); | 242 | secs, usec_rem, m->map_id, 0UL, 0); |
242 | break; | 243 | break; |
243 | default: | 244 | default: |
@@ -261,7 +262,7 @@ static enum print_line_t mmio_print_mark(struct trace_iterator *iter) | |||
261 | int ret; | 262 | int ret; |
262 | 263 | ||
263 | /* The trailing newline must be in the message. */ | 264 | /* The trailing newline must be in the message. */ |
264 | ret = trace_seq_printf(s, "MARK %lu.%06lu %s", secs, usec_rem, msg); | 265 | ret = trace_seq_printf(s, "MARK %u.%06lu %s", secs, usec_rem, msg); |
265 | if (!ret) | 266 | if (!ret) |
266 | return TRACE_TYPE_PARTIAL_LINE; | 267 | return TRACE_TYPE_PARTIAL_LINE; |
267 | 268 | ||