aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-12-16 08:12:17 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-17 09:38:43 -0400
commit7eafbce91b50317ef92d43c61b30a46cebe49f03 (patch)
treefecd37873650995c09da5716aca1a83234412312
parent2181d142707a2cf5df44840ac7112ac4568b03c9 (diff)
[media] v4l2-ctrls: use pr_info/cont instead of printk
Codingstyle fix. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/v4l2-core/v4l2-ctrls.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index e132fa21ccd6..365884b3abad 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -2068,45 +2068,45 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
2068 if (ctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS) 2068 if (ctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)
2069 return; 2069 return;
2070 2070
2071 printk(KERN_INFO "%s%s%s: ", prefix, colon, ctrl->name); 2071 pr_info("%s%s%s: ", prefix, colon, ctrl->name);
2072 2072
2073 switch (ctrl->type) { 2073 switch (ctrl->type) {
2074 case V4L2_CTRL_TYPE_INTEGER: 2074 case V4L2_CTRL_TYPE_INTEGER:
2075 printk(KERN_CONT "%d", ctrl->cur.val); 2075 pr_cont("%d", ctrl->cur.val);
2076 break; 2076 break;
2077 case V4L2_CTRL_TYPE_BOOLEAN: 2077 case V4L2_CTRL_TYPE_BOOLEAN:
2078 printk(KERN_CONT "%s", ctrl->cur.val ? "true" : "false"); 2078 pr_cont("%s", ctrl->cur.val ? "true" : "false");
2079 break; 2079 break;
2080 case V4L2_CTRL_TYPE_MENU: 2080 case V4L2_CTRL_TYPE_MENU:
2081 printk(KERN_CONT "%s", ctrl->qmenu[ctrl->cur.val]); 2081 pr_cont("%s", ctrl->qmenu[ctrl->cur.val]);
2082 break; 2082 break;
2083 case V4L2_CTRL_TYPE_INTEGER_MENU: 2083 case V4L2_CTRL_TYPE_INTEGER_MENU:
2084 printk(KERN_CONT "%lld", ctrl->qmenu_int[ctrl->cur.val]); 2084 pr_cont("%lld", ctrl->qmenu_int[ctrl->cur.val]);
2085 break; 2085 break;
2086 case V4L2_CTRL_TYPE_BITMASK: 2086 case V4L2_CTRL_TYPE_BITMASK:
2087 printk(KERN_CONT "0x%08x", ctrl->cur.val); 2087 pr_cont("0x%08x", ctrl->cur.val);
2088 break; 2088 break;
2089 case V4L2_CTRL_TYPE_INTEGER64: 2089 case V4L2_CTRL_TYPE_INTEGER64:
2090 printk(KERN_CONT "%lld", ctrl->cur.val64); 2090 pr_cont("%lld", ctrl->cur.val64);
2091 break; 2091 break;
2092 case V4L2_CTRL_TYPE_STRING: 2092 case V4L2_CTRL_TYPE_STRING:
2093 printk(KERN_CONT "%s", ctrl->cur.string); 2093 pr_cont("%s", ctrl->cur.string);
2094 break; 2094 break;
2095 default: 2095 default:
2096 printk(KERN_CONT "unknown type %d", ctrl->type); 2096 pr_cont("unknown type %d", ctrl->type);
2097 break; 2097 break;
2098 } 2098 }
2099 if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE | 2099 if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE |
2100 V4L2_CTRL_FLAG_GRABBED | 2100 V4L2_CTRL_FLAG_GRABBED |
2101 V4L2_CTRL_FLAG_VOLATILE)) { 2101 V4L2_CTRL_FLAG_VOLATILE)) {
2102 if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE) 2102 if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)
2103 printk(KERN_CONT " inactive"); 2103 pr_cont(" inactive");
2104 if (ctrl->flags & V4L2_CTRL_FLAG_GRABBED) 2104 if (ctrl->flags & V4L2_CTRL_FLAG_GRABBED)
2105 printk(KERN_CONT " grabbed"); 2105 pr_cont(" grabbed");
2106 if (ctrl->flags & V4L2_CTRL_FLAG_VOLATILE) 2106 if (ctrl->flags & V4L2_CTRL_FLAG_VOLATILE)
2107 printk(KERN_CONT " volatile"); 2107 pr_cont(" volatile");
2108 } 2108 }
2109 printk(KERN_CONT "\n"); 2109 pr_cont("\n");
2110} 2110}
2111 2111
2112/* Log all controls owned by the handler */ 2112/* Log all controls owned by the handler */