Commit 69396c4e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] uvc_driver: 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>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 9a9689cf
...@@ -1309,7 +1309,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, ...@@ -1309,7 +1309,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain,
switch (UVC_ENTITY_TYPE(entity)) { switch (UVC_ENTITY_TYPE(entity)) {
case UVC_VC_EXTENSION_UNIT: case UVC_VC_EXTENSION_UNIT:
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" <- XU %d", entity->id); printk(KERN_CONT " <- XU %d", entity->id);
if (entity->bNrInPins != 1) { if (entity->bNrInPins != 1) {
uvc_trace(UVC_TRACE_DESCR, "Extension unit %d has more " uvc_trace(UVC_TRACE_DESCR, "Extension unit %d has more "
...@@ -1321,7 +1321,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, ...@@ -1321,7 +1321,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain,
case UVC_VC_PROCESSING_UNIT: case UVC_VC_PROCESSING_UNIT:
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" <- PU %d", entity->id); printk(KERN_CONT " <- PU %d", entity->id);
if (chain->processing != NULL) { if (chain->processing != NULL) {
uvc_trace(UVC_TRACE_DESCR, "Found multiple " uvc_trace(UVC_TRACE_DESCR, "Found multiple "
...@@ -1334,7 +1334,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, ...@@ -1334,7 +1334,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain,
case UVC_VC_SELECTOR_UNIT: case UVC_VC_SELECTOR_UNIT:
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" <- SU %d", entity->id); printk(KERN_CONT " <- SU %d", entity->id);
/* Single-input selector units are ignored. */ /* Single-input selector units are ignored. */
if (entity->bNrInPins == 1) if (entity->bNrInPins == 1)
...@@ -1353,7 +1353,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, ...@@ -1353,7 +1353,7 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain,
case UVC_ITT_CAMERA: case UVC_ITT_CAMERA:
case UVC_ITT_MEDIA_TRANSPORT_INPUT: case UVC_ITT_MEDIA_TRANSPORT_INPUT:
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" <- IT %d\n", entity->id); printk(KERN_CONT " <- IT %d\n", entity->id);
break; break;
...@@ -1361,17 +1361,17 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain, ...@@ -1361,17 +1361,17 @@ static int uvc_scan_chain_entity(struct uvc_video_chain *chain,
case UVC_OTT_DISPLAY: case UVC_OTT_DISPLAY:
case UVC_OTT_MEDIA_TRANSPORT_OUTPUT: case UVC_OTT_MEDIA_TRANSPORT_OUTPUT:
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" OT %d", entity->id); printk(KERN_CONT " OT %d", entity->id);
break; break;
case UVC_TT_STREAMING: case UVC_TT_STREAMING:
if (UVC_ENTITY_IS_ITERM(entity)) { if (UVC_ENTITY_IS_ITERM(entity)) {
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" <- IT %d\n", entity->id); printk(KERN_CONT " <- IT %d\n", entity->id);
} else { } else {
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" OT %d", entity->id); printk(KERN_CONT " OT %d", entity->id);
} }
break; break;
...@@ -1416,9 +1416,9 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain, ...@@ -1416,9 +1416,9 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain,
list_add_tail(&forward->chain, &chain->entities); list_add_tail(&forward->chain, &chain->entities);
if (uvc_trace_param & UVC_TRACE_PROBE) { if (uvc_trace_param & UVC_TRACE_PROBE) {
if (!found) if (!found)
printk(" (->"); printk(KERN_CONT " (->");
printk(" XU %d", forward->id); printk(KERN_CONT " XU %d", forward->id);
found = 1; found = 1;
} }
break; break;
...@@ -1436,16 +1436,16 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain, ...@@ -1436,16 +1436,16 @@ static int uvc_scan_chain_forward(struct uvc_video_chain *chain,
list_add_tail(&forward->chain, &chain->entities); list_add_tail(&forward->chain, &chain->entities);
if (uvc_trace_param & UVC_TRACE_PROBE) { if (uvc_trace_param & UVC_TRACE_PROBE) {
if (!found) if (!found)
printk(" (->"); printk(KERN_CONT " (->");
printk(" OT %d", forward->id); printk(KERN_CONT " OT %d", forward->id);
found = 1; found = 1;
} }
break; break;
} }
} }
if (found) if (found)
printk(")"); printk(KERN_CONT ")");
return 0; return 0;
} }
...@@ -1471,7 +1471,7 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain, ...@@ -1471,7 +1471,7 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain,
} }
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" <- IT"); printk(KERN_CONT " <- IT");
chain->selector = entity; chain->selector = entity;
for (i = 0; i < entity->bNrInPins; ++i) { for (i = 0; i < entity->bNrInPins; ++i) {
...@@ -1485,14 +1485,14 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain, ...@@ -1485,14 +1485,14 @@ static int uvc_scan_chain_backward(struct uvc_video_chain *chain,
} }
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk(" %d", term->id); printk(KERN_CONT " %d", term->id);
list_add_tail(&term->chain, &chain->entities); list_add_tail(&term->chain, &chain->entities);
uvc_scan_chain_forward(chain, term, entity); uvc_scan_chain_forward(chain, term, entity);
} }
if (uvc_trace_param & UVC_TRACE_PROBE) if (uvc_trace_param & UVC_TRACE_PROBE)
printk("\n"); printk(KERN_CONT "\n");
id = 0; id = 0;
break; break;
......
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