microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[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>
This commit is contained in:
Hans Verkuil 2013-12-16 10:12:17 -03:00 коммит произвёл Mauro Carvalho Chehab
Родитель 2181d14270
Коммит 7eafbce91b
1 изменённых файлов: 13 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
drivers/media/v4l2-core/v4l2-ctrls.c
Просмотреть файл

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