Commit 623b2f4a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] zoran: use KERN_CONT where needed

Some continuation messages are not using KERN_CONT.

Since commit 56387331 ("Merge branch 'printk-cleanups"),
this won't work as expected anymore. So, let's add KERN_CONT
to those lines.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 7c66e121
...@@ -173,12 +173,8 @@ dump_guests (struct zoran *zr) ...@@ -173,12 +173,8 @@ dump_guests (struct zoran *zr)
guest[i] = post_office_read(zr, i, 0); guest[i] = post_office_read(zr, i, 0);
} }
printk(KERN_INFO "%s: Guests:", ZR_DEVNAME(zr)); printk(KERN_INFO "%s: Guests: %*ph\n",
ZR_DEVNAME(zr), 8, guest);
for (i = 1; i < 8; i++) {
printk(" 0x%02x", guest[i]);
}
printk("\n");
} }
} }
...@@ -216,12 +212,9 @@ detect_guest_activity (struct zoran *zr) ...@@ -216,12 +212,9 @@ detect_guest_activity (struct zoran *zr)
if (j >= 8) if (j >= 8)
break; break;
} }
printk(KERN_INFO "%s: Guests:", ZR_DEVNAME(zr));
for (i = 1; i < 8; i++) { printk(KERN_INFO "%s: Guests: %*ph\n", ZR_DEVNAME(zr), 8, guest0);
printk(" 0x%02x", guest0[i]);
}
printk("\n");
if (j == 0) { if (j == 0) {
printk(KERN_INFO "%s: No activity detected.\n", ZR_DEVNAME(zr)); printk(KERN_INFO "%s: No activity detected.\n", ZR_DEVNAME(zr));
return; return;
...@@ -822,39 +815,39 @@ print_interrupts (struct zoran *zr) ...@@ -822,39 +815,39 @@ print_interrupts (struct zoran *zr)
printk(KERN_INFO "%s: interrupts received:", ZR_DEVNAME(zr)); printk(KERN_INFO "%s: interrupts received:", ZR_DEVNAME(zr));
if ((res = zr->field_counter) < -1 || res > 1) { if ((res = zr->field_counter) < -1 || res > 1) {
printk(" FD:%d", res); printk(KERN_CONT " FD:%d", res);
} }
if ((res = zr->intr_counter_GIRQ1) != 0) { if ((res = zr->intr_counter_GIRQ1) != 0) {
printk(" GIRQ1:%d", res); printk(KERN_CONT " GIRQ1:%d", res);
noerr++; noerr++;
} }
if ((res = zr->intr_counter_GIRQ0) != 0) { if ((res = zr->intr_counter_GIRQ0) != 0) {
printk(" GIRQ0:%d", res); printk(KERN_CONT " GIRQ0:%d", res);
noerr++; noerr++;
} }
if ((res = zr->intr_counter_CodRepIRQ) != 0) { if ((res = zr->intr_counter_CodRepIRQ) != 0) {
printk(" CodRepIRQ:%d", res); printk(KERN_CONT " CodRepIRQ:%d", res);
noerr++; noerr++;
} }
if ((res = zr->intr_counter_JPEGRepIRQ) != 0) { if ((res = zr->intr_counter_JPEGRepIRQ) != 0) {
printk(" JPEGRepIRQ:%d", res); printk(KERN_CONT " JPEGRepIRQ:%d", res);
noerr++; noerr++;
} }
if (zr->JPEG_max_missed) { if (zr->JPEG_max_missed) {
printk(" JPEG delays: max=%d min=%d", zr->JPEG_max_missed, printk(KERN_CONT " JPEG delays: max=%d min=%d", zr->JPEG_max_missed,
zr->JPEG_min_missed); zr->JPEG_min_missed);
} }
if (zr->END_event_missed) { if (zr->END_event_missed) {
printk(" ENDs missed: %d", zr->END_event_missed); printk(KERN_CONT " ENDs missed: %d", zr->END_event_missed);
} }
//if (zr->jpg_queued_num) { //if (zr->jpg_queued_num) {
printk(" queue_state=%ld/%ld/%ld/%ld", zr->jpg_que_tail, printk(KERN_CONT " queue_state=%ld/%ld/%ld/%ld", zr->jpg_que_tail,
zr->jpg_dma_tail, zr->jpg_dma_head, zr->jpg_que_head); zr->jpg_dma_tail, zr->jpg_dma_head, zr->jpg_que_head);
//} //}
if (!noerr) { if (!noerr) {
printk(": no interrupts detected."); printk(KERN_CONT ": no interrupts detected.");
} }
printk("\n"); printk(KERN_CONT "\n");
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment