|
@@ -2068,45 +2068,45 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
|
|
|
if (ctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)
|
|
|
return;
|
|
|
|
|
|
- printk(KERN_INFO "%s%s%s: ", prefix, colon, ctrl->name);
|
|
|
+ pr_info("%s%s%s: ", prefix, colon, ctrl->name);
|
|
|
|
|
|
switch (ctrl->type) {
|
|
|
case V4L2_CTRL_TYPE_INTEGER:
|
|
|
- printk(KERN_CONT "%d", ctrl->cur.val);
|
|
|
+ pr_cont("%d", ctrl->cur.val);
|
|
|
break;
|
|
|
case V4L2_CTRL_TYPE_BOOLEAN:
|
|
|
- printk(KERN_CONT "%s", ctrl->cur.val ? "true" : "false");
|
|
|
+ pr_cont("%s", ctrl->cur.val ? "true" : "false");
|
|
|
break;
|
|
|
case V4L2_CTRL_TYPE_MENU:
|
|
|
- printk(KERN_CONT "%s", ctrl->qmenu[ctrl->cur.val]);
|
|
|
+ pr_cont("%s", ctrl->qmenu[ctrl->cur.val]);
|
|
|
break;
|
|
|
case V4L2_CTRL_TYPE_INTEGER_MENU:
|
|
|
- printk(KERN_CONT "%lld", ctrl->qmenu_int[ctrl->cur.val]);
|
|
|
+ pr_cont("%lld", ctrl->qmenu_int[ctrl->cur.val]);
|
|
|
break;
|
|
|
case V4L2_CTRL_TYPE_BITMASK:
|
|
|
- printk(KERN_CONT "0x%08x", ctrl->cur.val);
|
|
|
+ pr_cont("0x%08x", ctrl->cur.val);
|
|
|
break;
|
|
|
case V4L2_CTRL_TYPE_INTEGER64:
|
|
|
- printk(KERN_CONT "%lld", ctrl->cur.val64);
|
|
|
+ pr_cont("%lld", ctrl->cur.val64);
|
|
|
break;
|
|
|
case V4L2_CTRL_TYPE_STRING:
|
|
|
- printk(KERN_CONT "%s", ctrl->cur.string);
|
|
|
+ pr_cont("%s", ctrl->cur.string);
|
|
|
break;
|
|
|
default:
|
|
|
- printk(KERN_CONT "unknown type %d", ctrl->type);
|
|
|
+ pr_cont("unknown type %d", ctrl->type);
|
|
|
break;
|
|
|
}
|
|
|
if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE |
|
|
|
V4L2_CTRL_FLAG_GRABBED |
|
|
|
V4L2_CTRL_FLAG_VOLATILE)) {
|
|
|
if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)
|
|
|
- printk(KERN_CONT " inactive");
|
|
|
+ pr_cont(" inactive");
|
|
|
if (ctrl->flags & V4L2_CTRL_FLAG_GRABBED)
|
|
|
- printk(KERN_CONT " grabbed");
|
|
|
+ pr_cont(" grabbed");
|
|
|
if (ctrl->flags & V4L2_CTRL_FLAG_VOLATILE)
|
|
|
- printk(KERN_CONT " volatile");
|
|
|
+ pr_cont(" volatile");
|
|
|
}
|
|
|
- printk(KERN_CONT "\n");
|
|
|
+ pr_cont("\n");
|
|
|
}
|
|
|
|
|
|
/* Log all controls owned by the handler */
|